diff options
41 files changed, 907 insertions, 498 deletions
@@ -1,12 +1,15 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.3.6-dev, 2011-07-28 +v0.3.6-dev, 2011-07-29 Version 0.3.6 (under dev!) -------------------------- +* core: add number in windows (add optional argument "-window" so some actions + for command /window) +* core: replace buffer name by window number in /bar scroll * core: allow buffer name in /buffer close * core: add support of mouse: new command /mouse, new key context "mouse", new options weechat.look.mouse and weechat.look.mouse_timer_delay (task #5435) diff --git a/doc/de/autogen/plugin_api/completions.txt b/doc/de/autogen/plugin_api/completions.txt index 2f4abd9ea..179a6e727 100644 --- a/doc/de/autogen/plugin_api/completions.txt +++ b/doc/de/autogen/plugin_api/completions.txt @@ -108,6 +108,8 @@ | weechat | weechat_commands | WeeChat Befehle +| weechat | windows_numbers | numbers of windows + | xfer | nick | Nicks vom DCC Chat |======================================== diff --git a/doc/de/autogen/plugin_api/hdata.txt b/doc/de/autogen/plugin_api/hdata.txt index d8a91ccd8..d4560a5ff 100644 --- a/doc/de/autogen/plugin_api/hdata.txt +++ b/doc/de/autogen/plugin_api/hdata.txt @@ -500,6 +500,7 @@ 'weechat_plugins' | weechat | window | Fenster | + 'number' (integer) + 'win_x' (integer) + 'win_y' (integer) + 'win_width' (integer) + diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt index bb97cf54b..0acb0f303 100644 --- a/doc/de/autogen/user/weechat_commands.txt +++ b/doc/de/autogen/user/weechat_commands.txt @@ -14,7 +14,7 @@ message: Abwesenheitsnachricht (ohne eine Nachricht wird der Abwesenheitszustand del <name>|-all set <name> <option> <value> hide|show|toggle <name> - scroll <name> <buffer> <scroll_value> + scroll <name> <window> <scroll_value> list: list all bars listfull: list all bars (verbose) @@ -41,7 +41,7 @@ message: Abwesenheitsnachricht (ohne eine Nachricht wird der Abwesenheitszustand show: show an hidden bar toggle: hide/show a bar scroll: scroll bar - buffer: name of buffer to scroll ('*' means current buffer, you should use '*' for root bars) + window: window number (use '*' for current window or for root bars) scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', '-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to scroll by % of width/height, otherwise value is number of chars) Examples: @@ -589,56 +589,60 @@ Beispiele: [command]*`window`* Fenster verwalten:: ........................................ /window list - -1|+1|b#|up|down|left|right - splith|splitv [<pct>] - resize [+/-]<pct> + -1|+1|b#|up|down|left|right [-window <number>] + <number> + splith|splitv [-window <number>] [<pct>] + resize [-window <number>] [+/-]<pct> balance - merge [all] - page_up|page_down + merge [-window <number>] [all] + page_up|page_down [-window <number>] refresh - scroll [+/-]<value>[s|m|h|d|M|y] - scroll_horiz [+/-]<value>[%] - scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight - swap [up|down|left|right] - zoom - - list: listet die geöffneten Fenster (ohne Angabe von Parametern wird diese Funktion aufgerufen) - -1: springt zum vorherigen Fenster - +1: springt zum nächsten Fenster - b#: springt zum nächsten Fenster, welches die Buffer Nummer # besitzt - up: wechselt zum Fenster über dem aktuellen - down: wechselt zum Fenster unter dem aktuellen - left: wechselt zum linken Fenster - right: wechselt zum rechten Fenster - splith: teilt das aktuelle Fenster horizontal - splitv: teilt das aktuelle Fenster vertikal - resize: verändert die Größe des aktuellen Fensters. Die neue Größe des Fensters ist prozentual <pct> zum Stammfensters groß - balance: passt die Größe aller Fenster an - merge: vereinigt Fenster miteinander (all = alle Fenster vereinigen) - page_up: scrollt eine Seite nach oben - page_down: scrollt eine Seite nach unten - refresh: Seite wird neu aufgebaut - scroll: scrollt eine Anzahl an Zeilen (+/-N) oder zu einer gewissen Zeit: s=Sekunden, m=Minuten, h=Stunden, d=Tage, M=Monate, y=Jahre - scroll_horiz: scrollt horizontal eine Anzahl an Spalten (+/-N) oder prozentual von der Fenstergröße ausgehend (dieses scrolling ist nur in Buffern möglich die über einen freien Inhalt verfügen) - scroll_up: scrollt ein paar Zeilen nach oben - scroll_down: scrollt ein paar Zeilen nach unten - scroll_top: scrollt zum Anfang des Buffers -scroll_bottom: scrollt zum Ende des Buffers -scroll_previous_highlight: scrollt zum vorherigen Hightlight -scroll_next_highlight: scrollt zum nächsten Highlight - swap: tauscht die Buffer von zwei Fenstern (mit optionaler Angabe für das Zielfenster) - zoom: vergrößert auf Fenster - -Bei splith und splitv gibt "pct" die neue Größe des Fensters im Verhältnis zur aktuellen Größe an. Zum Beispiel würde ein Wert von 25 bedeuten, dass das neue Fenster nur noch ein Viertel der Größe des alten Fensters hat. + scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] + scroll_horiz [-window <number>] [+/-]<value>[%] + scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <number>] + swap [-window <number>] [up|down|left|right] + zoom[-window <number>] + + list: list opened windows (without argument, this list is displayed) + -1: jump to previous window + +1: jump to next window + b#: jump to next window displaying buffer number # + up: switch to window above current one + down: switch to window below current one + left: switch to window on the left + right: switch to window on the right + number: window number (see /window list) + splith: split current window horizontally + splitv: split current window vertically + resize: resize window size, new size is <pct> percentage of parent window + balance: balance the sizes of all windows + merge: merge window with another (all = keep only one window) + page_up: scroll one page up + page_down: scroll one page down + refresh: refresh screen + scroll: scroll a number of lines (+/-N) or with time: s=seconds, m=minutes, h=hours, d=days, M=months, y=years + scroll_horiz: scroll horizontally a number of columns (+/-N) or percentage of window size (this scrolling is possible only on buffers with free content) + scroll_up: scroll a few lines up + scroll_down: scroll a few lines down + scroll_top: scroll to top of buffer +scroll_bottom: scroll to bottom of buffer +scroll_previous_highlight: scroll to previous highlight +scroll_next_highlight: scroll to next highlight + swap: swap buffers of two windows (with optional direction for target window) + zoom: zoom on window + +For splith and splitv, pct is a percentage which represents size of new window, computed with current window as size reference. For example 25 means create a new window with size = current_size / 4 -Beispiele: - Springt zum Fenster mit dem Buffer #1: +Examples: + jump to window displaying buffer #1: /window b1 - Scrollt zwei Zeilen hoch: + scroll 2 lines up: /window scroll -2 - Scrollt zwei Tage hoch: /window scroll -2d + scroll 2 days up: /window scroll -2d - Scrollt zum Beginn des aktuellen Tages: + scroll to beginning of current day: /window scroll -d + zoom on window #2: + /window zoom -window 2 ........................................ diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index eec56335c..09c4bacf6 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -539,7 +539,7 @@ Keys for "cursor" context These keys are used in context "cursor" (free movement of cursor on screen). -[width="100%",cols="^.^3,^.^3,.^10,.^5l",options="header"] +[width="100%",cols="^.^3,^.^3,.^10,.^8l",options="header"] |======================================== | Key | Area | Description | Command | @k(↑) | - | Move cursor one line up | /cursor move up @@ -550,11 +550,11 @@ These keys are used in context "cursor" (free movement of cursor on screen). | @k(A-)@k(↓) | - | Move cursor one area down | /cursor move area_down | @k(A-)@k(←) | - | Move cursor one area left | /cursor move area_left | @k(A-)@k(→) | - | Move cursor one area right | /cursor move area_right -| @k(b) | nicklist | Ban nick | /ban ${nick} -| @k(k) | nicklist | Kick nick | /kick ${nick} -| @k(K) | nicklist | Kick and ban nick | /kickban ${nick} -| @k(q) | nicklist | Open query with nick | /query ${nick};/cursor stop -| @k(w) | nicklist | Do a whois on nick | /whois ${nick} +| @k(b) | nicklist | Ban nick | /window ${_window_number};/ban ${nick} +| @k(k) | nicklist | Kick nick | /window ${_window_number};/kick ${nick} +| @k(K) | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick} +| @k(q) | nicklist | Open query with nick | /window ${_window_number};/query ${nick};/cursor stop +| @k(w) | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick} | @k(Enter) .3+| - .3+| Stop cursor mode .3+| /cursor stop | @k(C-)@k(j) | @k(C-)@k(m) @@ -567,26 +567,27 @@ Keys for "mouse" context These keys are used in context "mouse", namely when a mouse event occurs. -[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^5l",options="header"] +[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^8l",options="header"] |======================================== | Button | Gesture | Area | Description | Command -| ◾◽◽ | left | chat | zum vorherigen Buffer springen | /buffer +1 -| ◾◽◽ | right | chat | zum nächsten Buffer springen | /buffer +1 -| ◾◽◽ | left (long) | chat | Switch to first buffer | /buffer 1 -| ◾◽◽ | right (long) | chat | wechselt zum letzten Buffer | /input jump_last_buffer -| wheel ⇑ | - | chat | einige Zeilen im Verlaufsspeicher des Buffer nach oben blättern | /window scroll_up -| wheel ⇓ | - | chat | einige Zeilen im Verlaufsspeicher des Buffer nach unten blättern | /window scroll_down -| ◾◽◽ | up | nicklist | Nickliste um eine Seite nach oben blättern | /bar scroll nicklist * -100% -| ◾◽◽ | down | nicklist | Nickliste um eine Seite nach unten blättern | /bar scroll nicklist * +100% -| ◾◽◽ | up (long) | nicklist | springt zum Anfang der Nickliste | /bar scroll nicklist * b -| ◾◽◽ | down (long) | nicklist | springt zum Ende der Nickliste | /bar scroll nicklist * e -| ◾◽◽ | - | nicklist | Open query with nick | /query ${nick} -| ◽◽◾ | - | nicklist | Do a whois on nick | /whois ${nick} -| ◾◽◽ | left | nicklist | Kick nick | /kick ${nick} -| ◾◽◽ | left (long) | nicklist | Kick and ban nick | /kickban ${nick} -| ◽◽◾ | left | nicklist | Ban nick | /ban ${nick} -| wheel ⇑ | - | any bar | Scroll bar by -10% | /bar scroll ${_bar_name} * -10% -| wheel ⇓ | - | any bar | Scroll bar by +10% | /bar scroll ${_bar_name} * +10% +| ◾◽◽ | - | chat | Switch to window | /window ${_window_number} +| ◾◽◽ | left | chat | zum vorherigen Buffer springen | /window ${_window_number};/buffer +1 +| ◾◽◽ | right | chat | zum nächsten Buffer springen | /window ${_window_number};/buffer +1 +| ◾◽◽ | left (long) | chat | Switch to first buffer | /window ${_window_number};/buffer 1 +| ◾◽◽ | right (long) | chat | wechselt zum letzten Buffer | /window ${_window_number};/input jump_last_buffer +| wheel ⇑ | - | chat | einige Zeilen im Verlaufsspeicher des Buffer nach oben blättern | /window scroll_up -window ${_window_number} +| wheel ⇓ | - | chat | einige Zeilen im Verlaufsspeicher des Buffer nach unten blättern | /window scroll_down -window ${_window_number} +| ◾◽◽ | up | nicklist | Nickliste um eine Seite nach oben blättern | /bar scroll nicklist ${_window_number} -100% +| ◾◽◽ | down | nicklist | Nickliste um eine Seite nach unten blättern | /bar scroll nicklist ${_window_number} +100% +| ◾◽◽ | up (long) | nicklist | springt zum Anfang der Nickliste | /bar scroll nicklist ${_window_number} b +| ◾◽◽ | down (long) | nicklist | springt zum Ende der Nickliste | /bar scroll nicklist ${_window_number} e +| ◾◽◽ | - | nicklist | Open query with nick | /window ${_window_number};/query ${nick} +| ◽◽◾ | - | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick} +| ◾◽◽ | left | nicklist | Kick nick | /window ${_window_number};/kick ${nick} +| ◾◽◽ | left (long) | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick} +| ◽◽◾ | left | nicklist | Ban nick | /window ${_window_number};/ban ${nick} +| wheel ⇑ | - | any bar | Scroll bar by -10% | /bar scroll ${_bar_name} ${_window_number} -10% +| wheel ⇓ | - | any bar | Scroll bar by +10% | /bar scroll ${_bar_name} ${_window_number} +10% | ◽◾◽ | - | anywhere | Start cursor mode at this point | /cursor go ${_x},${_y} |======================================== diff --git a/doc/en/autogen/plugin_api/completions.txt b/doc/en/autogen/plugin_api/completions.txt index 1e909099c..45626fdcc 100644 --- a/doc/en/autogen/plugin_api/completions.txt +++ b/doc/en/autogen/plugin_api/completions.txt @@ -108,6 +108,8 @@ | weechat | weechat_commands | weechat commands +| weechat | windows_numbers | numbers of windows + | xfer | nick | nicks of DCC chat |======================================== diff --git a/doc/en/autogen/plugin_api/hdata.txt b/doc/en/autogen/plugin_api/hdata.txt index b4c46732c..61bd9ff35 100644 --- a/doc/en/autogen/plugin_api/hdata.txt +++ b/doc/en/autogen/plugin_api/hdata.txt @@ -500,6 +500,7 @@ 'weechat_plugins' | weechat | window | window | + 'number' (integer) + 'win_x' (integer) + 'win_y' (integer) + 'win_width' (integer) + diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt index 04e6f595a..9ecda1c33 100644 --- a/doc/en/autogen/user/weechat_commands.txt +++ b/doc/en/autogen/user/weechat_commands.txt @@ -14,7 +14,7 @@ message: message for away (if no message is given, away status is removed) del <name>|-all set <name> <option> <value> hide|show|toggle <name> - scroll <name> <buffer> <scroll_value> + scroll <name> <window> <scroll_value> list: list all bars listfull: list all bars (verbose) @@ -41,7 +41,7 @@ message: message for away (if no message is given, away status is removed) show: show an hidden bar toggle: hide/show a bar scroll: scroll bar - buffer: name of buffer to scroll ('*' means current buffer, you should use '*' for root bars) + window: window number (use '*' for current window or for root bars) scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', '-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to scroll by % of width/height, otherwise value is number of chars) Examples: @@ -589,18 +589,19 @@ Examples: [command]*`window`* manage windows:: ........................................ /window list - -1|+1|b#|up|down|left|right - splith|splitv [<pct>] - resize [+/-]<pct> + -1|+1|b#|up|down|left|right [-window <number>] + <number> + splith|splitv [-window <number>] [<pct>] + resize [-window <number>] [+/-]<pct> balance - merge [all] - page_up|page_down + merge [-window <number>] [all] + page_up|page_down [-window <number>] refresh - scroll [+/-]<value>[s|m|h|d|M|y] - scroll_horiz [+/-]<value>[%] - scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight - swap [up|down|left|right] - zoom + scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] + scroll_horiz [-window <number>] [+/-]<value>[%] + scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <number>] + swap [-window <number>] [up|down|left|right] + zoom[-window <number>] list: list opened windows (without argument, this list is displayed) -1: jump to previous window @@ -610,6 +611,7 @@ Examples: down: switch to window below current one left: switch to window on the left right: switch to window on the right + number: window number (see /window list) splith: split current window horizontally splitv: split current window vertically resize: resize window size, new size is <pct> percentage of parent window @@ -640,5 +642,7 @@ Examples: /window scroll -2d scroll to beginning of current day: /window scroll -d + zoom on window #2: + /window zoom -window 2 ........................................ diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt index 73073109a..de7470bf1 100644 --- a/doc/en/weechat_plugin_api.en.txt +++ b/doc/en/weechat_plugin_api.en.txt @@ -8259,6 +8259,16 @@ Arguments: *** '_y': line of focus on screen (first line on top is "0") *** '_window': pointer of window with focus ("0x0" for a bar of type "root" or for unknown area) +*** '_window_number': number of window with focus (not set for a bar of type + "root" or for unknown area) +*** '_buffer': pointer of buffer with focus ("0x0" for a bar of type "root" + or for unknown area) +*** '_buffer_number': number of buffer with focus (not set for a bar of type + "root" or for unknown area) +*** '_buffer_plugin': plugin name of buffer with focus (not set for a bar of + type "root" or for unknown area) +*** '_buffer_name': name of buffer with focus (not set for a bar of type "root" + or for unknown area) *** '_bar_name': name of bar with focus (NULL for chat area or for unknown area) *** '_bar_item_name': name of bar item with focus (NULL if focus is not in a @@ -8756,7 +8766,7 @@ Arguments: * 'buffer': buffer pointer * 'property': property name: -** 'number': number of buffer (starts with 1) +** 'number': number of buffer (starts to 1) ** 'layout_number': number of buffer saved in layout ** 'type': buffer type (0: formatted, 1: free content) ** 'notify': notify level for buffer @@ -9325,6 +9335,7 @@ Arguments: * 'window': window pointer * 'property': property name: +** 'number': number of window (starts to 1) ** 'win_x': X position of window in terminal (first column is 0) ** 'win_y': Y position of window in terminal (first line is 0) ** 'win_width': width of window, in chars diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index 9139cccb1..7a91cae8e 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -538,7 +538,7 @@ Keys for "cursor" context These keys are used in context "cursor" (free movement of cursor on screen). -[width="100%",cols="^.^3,^.^3,.^10,.^5l",options="header"] +[width="100%",cols="^.^3,^.^3,.^10,.^8l",options="header"] |======================================== | Key | Area | Description | Command | @k(↑) | - | Move cursor one line up | /cursor move up @@ -549,11 +549,11 @@ These keys are used in context "cursor" (free movement of cursor on screen). | @k(A-)@k(↓) | - | Move cursor one area down | /cursor move area_down | @k(A-)@k(←) | - | Move cursor one area left | /cursor move area_left | @k(A-)@k(→) | - | Move cursor one area right | /cursor move area_right -| @k(b) | nicklist | Ban nick | /ban ${nick} -| @k(k) | nicklist | Kick nick | /kick ${nick} -| @k(K) | nicklist | Kick and ban nick | /kickban ${nick} -| @k(q) | nicklist | Open query with nick | /query ${nick};/cursor stop -| @k(w) | nicklist | Do a whois on nick | /whois ${nick} +| @k(b) | nicklist | Ban nick | /window ${_window_number};/ban ${nick} +| @k(k) | nicklist | Kick nick | /window ${_window_number};/kick ${nick} +| @k(K) | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick} +| @k(q) | nicklist | Open query with nick | /window ${_window_number};/query ${nick};/cursor stop +| @k(w) | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick} | @k(Enter) .3+| - .3+| Stop cursor mode .3+| /cursor stop | @k(C-)@k(j) | @k(C-)@k(m) @@ -565,26 +565,27 @@ Keys for "mouse" context These keys are used in context "mouse", namely when a mouse event occurs. -[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^5l",options="header"] +[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^8l",options="header"] |======================================== | Button | Gesture | Area | Description | Command -| ◾◽◽ | left | chat | Switch to previous buffer | /buffer +1 -| ◾◽◽ | right | chat | Switch to next buffer | /buffer +1 -| ◾◽◽ | left (long) | chat | Switch to first buffer | /buffer 1 -| ◾◽◽ | right (long) | chat | Switch to last buffer | /input jump_last_buffer -| wheel ⇑ | - | chat | Scroll up a few lines in buffer history | /window scroll_up -| wheel ⇓ | - | chat | Scroll down a few lines in buffer history | /window scroll_down -| ◾◽◽ | up | nicklist | Scroll up one page in nicklist | /bar scroll nicklist * -100% -| ◾◽◽ | down | nicklist | Scroll down one page in nicklist | /bar scroll nicklist * +100% -| ◾◽◽ | up (long) | nicklist | Go to the beginning of nicklist | /bar scroll nicklist * b -| ◾◽◽ | down (long) | nicklist | Go to the end of nicklist | /bar scroll nicklist * e -| ◾◽◽ | - | nicklist | Open query with nick | /query ${nick} -| ◽◽◾ | - | nicklist | Do a whois on nick | /whois ${nick} -| ◾◽◽ | left | nicklist | Kick nick | /kick ${nick} -| ◾◽◽ | left (long) | nicklist | Kick and ban nick | /kickban ${nick} -| ◽◽◾ | left | nicklist | Ban nick | /ban ${nick} -| wheel ⇑ | - | any bar | Scroll bar by -10% | /bar scroll ${_bar_name} * -10% -| wheel ⇓ | - | any bar | Scroll bar by +10% | /bar scroll ${_bar_name} * +10% +| ◾◽◽ | - | chat | Switch to window | /window ${_window_number} +| ◾◽◽ | left | chat | Switch to previous buffer | /window ${_window_number};/buffer +1 +| ◾◽◽ | right | chat | Switch to next buffer | /window ${_window_number};/buffer +1 +| ◾◽◽ | left (long) | chat | Switch to first buffer | /window ${_window_number};/buffer 1 +| ◾◽◽ | right (long) | chat | Switch to last buffer | /window ${_window_number};/input jump_last_buffer +| wheel ⇑ | - | chat | Scroll up a few lines in buffer history | /window scroll_up -window ${_window_number} +| wheel ⇓ | - | chat | Scroll down a few lines in buffer history | /window scroll_down -window ${_window_number} +| ◾◽◽ | up | nicklist | Scroll up one page in nicklist | /bar scroll nicklist ${_window_number} -100% +| ◾◽◽ | down | nicklist | Scroll down one page in nicklist | /bar scroll nicklist ${_window_number} +100% +| ◾◽◽ | up (long) | nicklist | Go to the beginning of nicklist | /bar scroll nicklist ${_window_number} b +| ◾◽◽ | down (long) | nicklist | Go to the end of nicklist | /bar scroll nicklist ${_window_number} e +| ◾◽◽ | - | nicklist | Open query with nick | /window ${_window_number};/query ${nick} +| ◽◽◾ | - | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick} +| ◾◽◽ | left | nicklist | Kick nick | /window ${_window_number};/kick ${nick} +| ◾◽◽ | left (long) | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick} +| ◽◽◾ | left | nicklist | Ban nick | /window ${_window_number};/ban ${nick} +| wheel ⇑ | - | any bar | Scroll bar by -10% | /bar scroll ${_bar_name} ${_window_number} -10% +| wheel ⇓ | - | any bar | Scroll bar by +10% | /bar scroll ${_bar_name} ${_window_number} +10% | ◽◾◽ | - | anywhere | Start cursor mode at this point | /cursor go ${_x},${_y} |======================================== diff --git a/doc/fr/autogen/plugin_api/completions.txt b/doc/fr/autogen/plugin_api/completions.txt index 5aa171ffe..eb090fc45 100644 --- a/doc/fr/autogen/plugin_api/completions.txt +++ b/doc/fr/autogen/plugin_api/completions.txt @@ -108,6 +108,8 @@ | weechat | weechat_commands | commandes weechat +| weechat | windows_numbers | numéros des fenêtres + | xfer | nick | pseudos de la discussion DCC |======================================== diff --git a/doc/fr/autogen/plugin_api/hdata.txt b/doc/fr/autogen/plugin_api/hdata.txt index eb33cc3e0..0eecffe6e 100644 --- a/doc/fr/autogen/plugin_api/hdata.txt +++ b/doc/fr/autogen/plugin_api/hdata.txt @@ -500,6 +500,7 @@ 'weechat_plugins' | weechat | window | fenêtre | + 'number' (integer) + 'win_x' (integer) + 'win_y' (integer) + 'win_width' (integer) + diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt index 8d7a900cd..f7b3d2645 100644 --- a/doc/fr/autogen/user/weechat_commands.txt +++ b/doc/fr/autogen/user/weechat_commands.txt @@ -14,7 +14,7 @@ message: message pour l'absence (si pas de message donné, le statut d'absence e del <nom>|-all set <nom> <option> <valeur> hide|show|toggle <nom> - scroll <nom> <tampon> <valeur_scroll> + scroll <nom> <fenêtre> <valeur_scroll> list: lister toutes les barres listfull: lister toutes les barres (verbeux) @@ -41,7 +41,7 @@ message: message pour l'absence (si pas de message donné, le statut d'absence e show: montrer une barre cachée toggle: cacher/montrer une barre scroll: faire défiler la barre - tampon: catégorie et nom du tampon ('*' signifie le tampon courant, vous devez utiliser '*' pour les barres de type root) + fenêtre: numéro de fenêtre (utilisez '*' pour la fenêtre courante ou une barre de type root) valeur_scroll: valeur pour le défilement: 'x' ou 'y' (optionnel), suivi par '+', '-', 'b' (début) ou 'e' (fin), valeur (pour +/-), et un % optionnel (pour faire défiler par % de la largeur/hauteur, sinon la valeur est un nombre de caractères) Exemples: @@ -589,18 +589,19 @@ Exemples: [command]*`window`* gestion des fenêtres:: ........................................ /window list - -1|+1|b#|up|down|left|right - splith|splitv [<pct>] - resize [+/-]<pct> + -1|+1|b#|up|down|left|right [-window <numéro>] + <numéro> + splith|splitv [-window <numéro>] [<pct>] + resize [-window <numéro>] [+/-]<pct> balance - merge [all] - page_up|page_down + merge [-window <numéro>] [all] + page_up|page_down [-window <numéro>] refresh - scroll [+/-]<valeur>[s|m|h|d|M|y] - scroll_horiz [+/-]<valeur>[%] - scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight - swap [up|down|left|right] - zoom + scroll [-window <numéro>] [+/-]<valeur>[s|m|h|d|M|y] + scroll_horiz [-window <numéro>] [+/-]<valeur>[%] + scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <numéro>] + swap [-window <numéro>] [up|down|left|right] + zoom [-window <numéro>] list: lister les fenêtres ouvertes (sans paramètre, cette liste est affichée) -1: sauter à la fenêtre précédente @@ -610,6 +611,7 @@ Exemples: down: sauter à la fenêtre au dessous left: sauter à la fenêtre à gauche right: sauter à la fenêtre à droite + numéro: numéro de fenêtre (voir /window list) splith: éclater la fenêtre en deux horizontalement splitv: éclater la fenêtre en deux verticalement resize: redimensionner une fenêtre, la nouvelle taille est <pct> pourcentage de la fenêtre parent @@ -640,5 +642,7 @@ Exemples: /window scroll -2d défilement jusqu'au début du jour courant: /window scroll -d + zoom sur la fenêtre numéro 2: + /window zoom -window 2 ........................................ diff --git a/doc/fr/weechat_plugin_api.fr.txt b/doc/fr/weechat_plugin_api.fr.txt index 94b142bf0..2454498c3 100644 --- a/doc/fr/weechat_plugin_api.fr.txt +++ b/doc/fr/weechat_plugin_api.fr.txt @@ -8391,7 +8391,17 @@ Paramètres : *** '_x' : colonne du focus sur l'écran (la première colonne sur la gauche est "0") *** '_y' : ligne du focus sur l'écran (la première ligne en haut est "0") -*** '_window' : pointeur de la fenêtre avec le focus (NULL pour une barre de +*** '_window' : pointeur de la fenêtre avec le focus ("0x0" pour une barre de + type "root" ou pour une zone inconnue) +*** '_window_number' : numéro de la fenêtre avec le focus (non défini pour une + barre de type "root" ou pour une zone inconnue) +*** '_buffer' : pointeur du tampon avec le focus ("0x0" pour une barre de type + "root" ou pour une zone inconnue) +*** '_buffer_number' : numéro du tampon avec le focus (non défini pour une barre + de type "root" ou pour une zone inconnue) +*** '_buffer_plugin' : nom d'extension du tampon avec le focus (non défini pour + une barre de type "root" ou pour une zone inconnue) +*** '_buffer_name' : nom du tampon avec le focus (non défini pour une barre de type "root" ou pour une zone inconnue) *** '_bar_name' : nom de la barre avec le focus (NULL pour la zone de discussion ("chat") ou pour une zone inconnue) @@ -9483,6 +9493,7 @@ Paramètres : * 'window' : pointeur vers la fenêtre * 'property' : nom de la propriété : +** 'number' : numéro de la fenêtre (commence à 1) ** 'win_x' : position X de la fenêtre dans le terminal (la première colonne est 0) ** 'win_y' : position Y de la fenêtre dans le terminal (la première ligne est diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index 07b60e55f..8d0eff75a 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -547,7 +547,7 @@ Touches pour le contexte "cursor" Ces touches sont utilisées dans le contexte "cursor" (mouvement libre du curseur à l'écran). -[width="100%",cols="^.^3,^.^3,.^10,.^5l",options="header"] +[width="100%",cols="^.^3,^.^3,.^10,.^8l",options="header"] |======================================== | Touche | Zone | Description | Commande | @k(↑) | - | Déplacer le curseur d'une ligne vers le haut | /cursor move up @@ -558,11 +558,11 @@ Ces touches sont utilisées dans le contexte "cursor" (mouvement libre du curseu | @k(A-)@k(↓) | - | Déplacer le curseur vers la zone en dessous | /cursor move area_down | @k(A-)@k(←) | - | Déplacer le curseur vers la zone sur la gauche | /cursor move area_left | @k(A-)@k(→) | - | Déplacer le curseur vers la zone sur la droite | /cursor move area_right -| @k(b) | liste des pseudos | Bannir le pseudo | /ban ${nick} -| @k(k) | liste des pseudos | Retirer par la force le pseudo | /kick ${nick} -| @k(K) | liste des pseudos | Retirer par la force et bannir le pseudo | /kickban ${nick} -| @k(q) | liste des pseudos | Ouvrir une discussion avec le pseudo | /query ${nick};/cursor stop -| @k(w) | liste des pseudos | Effectuer un whois sur le pseudo | /whois ${nick} +| @k(b) | liste des pseudos | Bannir le pseudo | /window ${_window_number};/ban ${nick} +| @k(k) | liste des pseudos | Retirer par la force le pseudo | /window ${_window_number};/kick ${nick} +| @k(K) | liste des pseudos | Retirer par la force et bannir le pseudo | /window ${_window_number};/kickban ${nick} +| @k(q) | liste des pseudos | Ouvrir une discussion avec le pseudo | /window ${_window_number};/query ${nick};/cursor stop +| @k(w) | liste des pseudos | Effectuer un whois sur le pseudo | /window ${_window_number};/whois ${nick} | @k(Enter) .3+| - .3+| Stop cursor mode .3+| /cursor stop | @k(C-)@k(j) | @k(C-)@k(m) @@ -575,26 +575,27 @@ Touches pour le contexte "mouse" Ces touches sont utilisées dans le contexte "mouse", c'est-à-dire lorsqu'un évènement de la souris se produit. -[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^5l",options="header"] +[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^8l",options="header"] |======================================== | Bouton | Geste | Zone | Description | Commande -| ◾◽◽ | left | chat | Aller au tampon précédent | /buffer +1 -| ◾◽◽ | right | chat | Aller au tampon suivant | /buffer +1 -| ◾◽◽ | left (long) | chat | Aller au premier tampon | /buffer 1 -| ◾◽◽ | right (long) | chat | Aller au dernier tampon | /input jump_last_buffer -| roulette ⇑ | - | chat | Monter de quelques lignes dans l'historique du tampon | /window scroll_up -| roulette ⇓ | - | chat | Descendre de quelques lignes dans l'historique du tampon | /window scroll_down -| ◾◽◽ | up | liste des pseudos | Monter d'une page dans la liste des pseudos | /bar scroll nicklist * -100% -| ◾◽◽ | down | liste des pseudos | Descendre d'une page dans la liste des pseudos | /bar scroll nicklist * +100% -| ◾◽◽ | up (long) | liste des pseudos | Aller au début de la liste des pseudos | /bar scroll nicklist * b -| ◾◽◽ | down (long) | liste des pseudos | Aller à la fin de la liste des pseudos | /bar scroll nicklist * e -| ◾◽◽ | - | liste des pseudos | Ouvrir une discussion avec le pseudo | /query ${nick} -| ◽◽◾ | - | liste des pseudos | Effectuer un whois sur le pseudo | /whois ${nick} -| ◾◽◽ | left | liste des pseudos | Retirer par la force le pseudo | /kick ${nick} -| ◾◽◽ | left (long) | liste des pseudos | Retirer par la force et bannir le pseudo | /kickban ${nick} -| ◽◽◾ | left | liste des pseudos | Bannir le pseudo | /ban ${nick} -| roulette ⇑ | - | toute barre | Faire défiler la barre de -10% | /bar scroll ${_bar_name} * -10% -| roulette ⇓ | - | toute barre | Faire défiler la barre de +10% | /bar scroll ${_bar_name} * +10% +| ◾◽◽ | - | chat | Aller à la fenêtre | /window ${_window_number} +| ◾◽◽ | left | chat | Aller au tampon précédent | /window ${_window_number};/buffer +1 +| ◾◽◽ | right | chat | Aller au tampon suivant | /window ${_window_number};/buffer +1 +| ◾◽◽ | left (long) | chat | Aller au premier tampon | /window ${_window_number};/buffer 1 +| ◾◽◽ | right (long) | chat | Aller au dernier tampon | /window ${_window_number};/input jump_last_buffer +| roulette ⇑ | - | chat | Monter de quelques lignes dans l'historique du tampon | /window scroll_up -window ${_window_number} +| roulette ⇓ | - | chat | Descendre de quelques lignes dans l'historique du tampon | /window scroll_down -window ${_window_number} +| ◾◽◽ | up | liste des pseudos | Monter d'une page dans la liste des pseudos | /bar scroll nicklist ${_window_number} -100% +| ◾◽◽ | down | liste des pseudos | Descendre d'une page dans la liste des pseudos | /bar scroll nicklist ${_window_number} +100% +| ◾◽◽ | up (long) | liste des pseudos | Aller au début de la liste des pseudos | /bar scroll nicklist ${_window_number} b +| ◾◽◽ | down (long) | liste des pseudos | Aller à la fin de la liste des pseudos | /bar scroll nicklist ${_window_number} e +| ◾◽◽ | - | liste des pseudos | Ouvrir une discussion avec le pseudo | /window ${_window_number};/query ${nick} +| ◽◽◾ | - | liste des pseudos | Effectuer un whois sur le pseudo | /window ${_window_number};/whois ${nick} +| ◾◽◽ | left | liste des pseudos | Retirer par la force le pseudo | /window ${_window_number};/kick ${nick} +| ◾◽◽ | left (long) | liste des pseudos | Retirer par la force et bannir le pseudo | /window ${_window_number};/kickban ${nick} +| ◽◽◾ | left | liste des pseudos | Bannir le pseudo | /window ${_window_number};/ban ${nick} +| roulette ⇑ | - | toute barre | Faire défiler la barre de -10% | /bar scroll ${_bar_name} ${_window_number} -10% +| roulette ⇓ | - | toute barre | Faire défiler la barre de +10% | /bar scroll ${_bar_name} ${_window_number} +10% | ◽◾◽ | - | n'importe où | Démarrer le mode curseur ("cursor") à ce point | /cursor go ${_x},${_y} |======================================== diff --git a/doc/it/autogen/plugin_api/completions.txt b/doc/it/autogen/plugin_api/completions.txt index eab556506..a122bd267 100644 --- a/doc/it/autogen/plugin_api/completions.txt +++ b/doc/it/autogen/plugin_api/completions.txt @@ -108,6 +108,8 @@ | weechat | weechat_commands | comandi di weechat +| weechat | windows_numbers | numbers of windows + | xfer | nick | nick della chat DCC |======================================== diff --git a/doc/it/autogen/plugin_api/hdata.txt b/doc/it/autogen/plugin_api/hdata.txt index 1de895931..c0e0446e2 100644 --- a/doc/it/autogen/plugin_api/hdata.txt +++ b/doc/it/autogen/plugin_api/hdata.txt @@ -500,6 +500,7 @@ 'weechat_plugins' | weechat | window | finestra | + 'number' (integer) + 'win_x' (integer) + 'win_y' (integer) + 'win_width' (integer) + diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt index ea9d7c93a..607e4c969 100644 --- a/doc/it/autogen/user/weechat_commands.txt +++ b/doc/it/autogen/user/weechat_commands.txt @@ -9,12 +9,12 @@ messaggio: messaggio di assenza (se non specificato, lo stato di assenza viene r [command]*`bar`* gestione barre:: ........................................ /bar list|listfull|listitems - add <nome> <tipo>[,<cond1>[,<cond2>...]] <posizione> <dimensione> <separatore> <elemento1>[,<elemento2>...] + add <name> <type>[,<cond1>[,<cond2>...]] <position> <size> <separator> <item1>[,<item2>...] default [input|title|status|nicklist] - del <nome>|-all - set <nome> <opzione> <valore> - hide|show|toggle <nome> - scroll <nome> <buffer> <scroll_value> + del <name>|-all + set <name> <option> <value> + hide|show|toggle <name> + scroll <name> <window> <scroll_value> list: list all bars listfull: list all bars (verbose) @@ -41,7 +41,7 @@ messaggio: messaggio di assenza (se non specificato, lo stato di assenza viene r show: show an hidden bar toggle: hide/show a bar scroll: scroll bar - buffer: name of buffer to scroll ('*' means current buffer, you should use '*' for root bars) + window: window number (use '*' for current window or for root bars) scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', '-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to scroll by % of width/height, otherwise value is number of chars) Examples: @@ -589,56 +589,60 @@ Esempi: [command]*`window`* gestione finestre:: ........................................ /window list - -1|+1|b#|up|down|left|right - splith|splitv [<pct>] - resize [+/-] <pct> + -1|+1|b#|up|down|left|right [-window <number>] + <number> + splith|splitv [-window <number>] [<pct>] + resize [-window <number>] [+/-]<pct> balance - merge [all] - page_up|page_down + merge [-window <number>] [all] + page_up|page_down [-window <number>] refresh - scroll|[+/-]<valore>[s|m|h|d|M|y] - scroll_horiz [+/-]<valore>[%] - scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight - swap [up|down|left|right] - zoom - - list: elenca le finestre aperte (senza argomento, questa lista viene visualizzata) - -1: salta alla finestra precedente - +1: salta alla finestra successiva - b#: salta alla finestra successiva che visualizza il buffer numero # - up: passa alla finestra superiore a quella corrente - down: passa alla finestra inferiore a quella attiva - left: passa alla finestra a sinistra - right: passa alla finestra a destra - splith: divide la finestra attiva orizzontalmente - splitv: divide la finestra attiva verticalmente - resize: ridimensiona finestra, la nuova dimensione è <pct> percentuale della finestra genitore - balance: bilancia le dimensioni tutte le finestre - merge: unisce la finestra con un'altra (all = mantiente una sola finestra) - page_up: scorre di una pagina in alto - page_down: scorre di una pagina in basso - refresh: aggiorna lo schermo - scroll: scorre di un numero di righe (+/-N) o in base al tempo: s=secondi, m=minuti, h=ore, d=giorni, M=mesi, y=anni - scroll_horiz: scorre orizzontalmente un numero di colonne (+/-N) una percentuale della dimensione della finestra (questo scorrimento è possibile solo sui buffer con contenuto libero) - scroll_up: scorre di alcune righe in alto - scroll_down: scorre di alcune righe in basso - scroll_top: scorre fino all'inizio del buffer -scroll_bottom: scorre fino alla fine del buffer buffer -scroll_previous_highlight: passa all'evento precedente - scroll_next_highlight: passa all'evento successivo - swap: scambia i buffer di due finestra (con direzione opzionale per la finestra di destinazione) - zoom: ingrandimento sulla finestra - -Per splith e splitv, pct è una percentuale che rappresenta la dimensione della nuova finestra, calcolata con la finestra attiva come riferimento per la dimensione. Per esempio 25 vuol dire creare una finestra di dimensione = dimensione_attuale / 4 + scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] + scroll_horiz [-window <number>] [+/-]<value>[%] + scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-window <number>] + swap [-window <number>] [up|down|left|right] + zoom[-window <number>] + + list: list opened windows (without argument, this list is displayed) + -1: jump to previous window + +1: jump to next window + b#: jump to next window displaying buffer number # + up: switch to window above current one + down: switch to window below current one + left: switch to window on the left + right: switch to window on the right + number: window number (see /window list) + splith: split current window horizontally + splitv: split current window vertically + resize: resize window size, new size is <pct> percentage of parent window + balance: balance the sizes of all windows + merge: merge window with another (all = keep only one window) + page_up: scroll one page up + page_down: scroll one page down + refresh: refresh screen + scroll: scroll a number of lines (+/-N) or with time: s=seconds, m=minutes, h=hours, d=days, M=months, y=years + scroll_horiz: scroll horizontally a number of columns (+/-N) or percentage of window size (this scrolling is possible only on buffers with free content) + scroll_up: scroll a few lines up + scroll_down: scroll a few lines down + scroll_top: scroll to top of buffer +scroll_bottom: scroll to bottom of buffer +scroll_previous_highlight: scroll to previous highlight +scroll_next_highlight: scroll to next highlight + swap: swap buffers of two windows (with optional direction for target window) + zoom: zoom on window + +For splith and splitv, pct is a percentage which represents size of new window, computed with current window as size reference. For example 25 means create a new window with size = current_size / 4 -Esempi: - salta alla finestra che visualizza il buffer #1: +Examples: + jump to window displaying buffer #1: /window b1 - scorre di due righe in alto: + scroll 2 lines up: /window scroll -2 - scorre all'indietro di due giorni: + scroll 2 days up: /window scroll -2d - scorre all'inizio del giorno attuale: - /window scroll -d + scroll to beginning of current day: + /window scroll -d + zoom on window #2: + /window zoom -window 2 ........................................ diff --git a/doc/it/weechat_plugin_api.it.txt b/doc/it/weechat_plugin_api.it.txt index b9e5ab4a8..ff4cb3f04 100644 --- a/doc/it/weechat_plugin_api.it.txt +++ b/doc/it/weechat_plugin_api.it.txt @@ -8314,6 +8314,16 @@ Argomenti: *** '_y': line of focus on screen (first line on top is "0") *** '_window': pointer of window with focus ("0x0" for a bar of type "root" or for unknown area) +*** '_window_number': number of window with focus (not set for a bar of type + "root" or for unknown area) +*** '_buffer': pointer of buffer with focus ("0x0" for a bar of type "root" + or for unknown area) +*** '_buffer_number': number of buffer with focus (not set for a bar of type + "root" or for unknown area) +*** '_buffer_plugin': plugin name of buffer with focus (not set for a bar of + type "root" or for unknown area) +*** '_buffer_name': name of buffer with focus (not set for a bar of type "root" + or for unknown area) *** '_bar_name': name of bar with focus (NULL for chat area or for unknown area) *** '_bar_item_name': name of bar item with focus (NULL if focus is not in a @@ -9399,6 +9409,8 @@ Argomenti: * 'window': puntatore alla finestra * 'property': nome della proprietà: +// TRANSLATION MISSING +** 'number': number of window (starts to 1) ** 'win_x': posizione X della finestra nel terminale (la prima colonna è 0) ** 'win_y': posizione Y della finestra nel terminale (la prima riga è 0) ** 'win_width': larghezza della finestra, in caratteri diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index 7e9a34ba6..53da149d0 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -547,7 +547,7 @@ Keys for "cursor" context These keys are used in context "cursor" (free movement of cursor on screen). -[width="100%",cols="^.^3,^.^3,.^10,.^5l",options="header"] +[width="100%",cols="^.^3,^.^3,.^10,.^8l",options="header"] |======================================== | Key | Area | Description | Command | @k(↑) | - | Move cursor one line up | /cursor move up @@ -558,11 +558,11 @@ These keys are used in context "cursor" (free movement of cursor on screen). | @k(A-)@k(↓) | - | Move cursor one area down | /cursor move area_down | @k(A-)@k(←) | - | Move cursor one area left | /cursor move area_left | @k(A-)@k(→) | - | Move cursor one area right | /cursor move area_right -| @k(b) | nicklist | Ban nick | /ban ${nick} -| @k(k) | nicklist | Kick nick | /kick ${nick} -| @k(K) | nicklist | Kick and ban nick | /kickban ${nick} -| @k(q) | nicklist | Open query with nick | /query ${nick};/cursor stop -| @k(w) | nicklist | Do a whois on nick | /whois ${nick} +| @k(b) | nicklist | Ban nick | /window ${_window_number};/ban ${nick} +| @k(k) | nicklist | Kick nick | /window ${_window_number};/kick ${nick} +| @k(K) | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick} +| @k(q) | nicklist | Open query with nick | /window ${_window_number};/query ${nick};/cursor stop +| @k(w) | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick} | @k(Enter) .3+| - .3+| Stop cursor mode .3+| /cursor stop | @k(C-)@k(j) | @k(C-)@k(m) @@ -575,26 +575,27 @@ Keys for "mouse" context These keys are used in context "mouse", namely when a mouse event occurs. -[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^5l",options="header"] +[width="100%",cols="^.^3,^.^3,^.^3,.^10,.^8l",options="header"] |======================================== | Button | Gesture | Area | Description | Command -| ◾◽◽ | left | chat | Passa al buffer precedente | /buffer +1 -| ◾◽◽ | right | chat | Passa al buffer successivo | /buffer +1 -| ◾◽◽ | left (long) | chat | Switch to first buffer | /buffer 1 -| ◾◽◽ | right (long) | chat | Passa all'ultimo buffer | /input jump_last_buffer -| wheel ⇑ | - | chat | Scorre di qualche riga in alto nella cronologia del buffer | /window scroll_up -| wheel ⇓ | - | chat | Scorre di qualche riga in basso nella cronologia del buffer | /window scroll_down -| ◾◽◽ | up | nicklist | Scorre di una pagina in alto nella lista nick | /bar scroll nicklist * -100% -| ◾◽◽ | down | nicklist | Scorre di una pagina in basso nella lista nick | /bar scroll nicklist * +100% -| ◾◽◽ | up (long) | nicklist | Sposta all'inizio della lista nick | /bar scroll nicklist * b -| ◾◽◽ | down (long) | nicklist | Sposta alla fine della lista nick | /bar scroll nicklist * e -| ◾◽◽ | - | nicklist | Open query with nick | /query ${nick} -| ◽◽◾ | - | nicklist | Do a whois on nick | /whois ${nick} -| ◾◽◽ | left | nicklist | Kick nick | /kick ${nick} -| ◾◽◽ | left (long) | nicklist | Kick and ban nick | /kickban ${nick} -| ◽◽◾ | left | nicklist | Ban nick | /ban ${nick} -| wheel ⇑ | - | any bar | Scroll bar by -10% | /bar scroll ${_bar_name} * -10% -| wheel ⇓ | - | any bar | Scroll bar by +10% | /bar scroll ${_bar_name} * +10% +| ◾◽◽ | - | chat | Switch to window | /window ${_window_number} +| ◾◽◽ | left | chat | Passa al buffer precedente | /window ${_window_number};/buffer +1 +| ◾◽◽ | right | chat | Passa al buffer successivo | /window ${_window_number};/buffer +1 +| ◾◽◽ | left (long) | chat | Switch to first buffer | /window ${_window_number};/buffer 1 +| ◾◽◽ | right (long) | chat | Passa all'ultimo buffer | /window ${_window_number};/input jump_last_buffer +| wheel ⇑ | - | chat | Scorre di qualche riga in alto nella cronologia del buffer | /window scroll_up -window ${_window_number} +| wheel ⇓ | - | chat | Scorre di qualche riga in basso nella cronologia del buffer | /window scroll_down -window ${_window_number} +| ◾◽◽ | up | nicklist | Scorre di una pagina in alto nella lista nick | /bar scroll nicklist ${_window_number} -100% +| ◾◽◽ | down | nicklist | Scorre di una pagina in basso nella lista nick | /bar scroll nicklist ${_window_number} +100% +| ◾◽◽ | up (long) | nicklist | Sposta all'inizio della lista nick | /bar scroll nicklist ${_window_number} b +| ◾◽◽ | down (long) | nicklist | Sposta alla fine della lista nick | /bar scroll nicklist ${_window_number} e +| ◾◽◽ | - | nicklist | Open query with nick | /window ${_window_number};/query ${nick} +| ◽◽◾ | - | nicklist | Do a whois on nick | /window ${_window_number};/whois ${nick} +| ◾◽◽ | left | nicklist | Kick nick | /window ${_window_number};/kick ${nick} +| ◾◽◽ | left (long) | nicklist | Kick and ban nick | /window ${_window_number};/kickban ${nick} +| ◽◽◾ | left | nicklist | Ban nick | /window ${_window_number};/ban ${nick} +| wheel ⇑ | - | any bar | Scroll bar by -10% | /bar scroll ${_bar_name} ${_window_number} -10% +| wheel ⇓ | - | any bar | Scroll bar by +10% | /bar scroll ${_bar_name} ${_window_number} +10% | ◽◾◽ | - | anywhere | Start cursor mode at this point | /cursor go ${_x},${_y} |======================================== @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-28 15:34+0200\n" +"POT-Creation-Date: 2011-07-29 19:41+0200\n" "PO-Revision-Date: 2011-07-05 15:37+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -187,8 +187,8 @@ msgstr "Pole bylo smazáno" msgid "%sError: unable to set option \"%s\" for bar \"%s\"" msgstr "%sChyba: nemohu nastavit volbu \"%s\" pro pole \"%s\"" -#, c-format -msgid "%sError: buffer not found for \"%s\" command" +#, fuzzy, c-format +msgid "%sError: window not found for \"%s\" command" msgstr "%sChyba: buffer nenalezen pro příkaz \"%s\"" #, c-format @@ -786,6 +786,10 @@ msgstr[2] "krát" msgid "Windows list:" msgstr "Seznam oken:" +#, fuzzy, c-format +msgid "%sError: incorrect window number" +msgstr "%sChyba: nekorektní číslo bufferu" + #, c-format msgid "" "%sError: can not merge windows, there's no other window with same size near " @@ -811,11 +815,12 @@ msgstr "" msgid "manage bars" msgstr "řídit pole" +#, fuzzy msgid "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" "status|nicklist] || del <name>|-all || set <name> <option> <value> || hide|" -"show|toggle <name> || scroll <name> <buffer> <scroll_value>" +"show|toggle <name> || scroll <name> <window> <scroll_value>" msgstr "" "list|listfull|listitems || add <jméno> <typ>[,<podmínka1>[,<podmínka2>...]] " "<pozice> <velikost> <oddělovac> <položka1>[,<položka2>...] || default [input|" @@ -854,8 +859,7 @@ msgid "" " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" -" buffer: name of buffer to scroll ('*' means current buffer, you " -"should use '*' for root bars)\n" +" window: window number (use '*' for current window or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', " "'-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to " "scroll by % of width/height, otherwise value is number of chars)\n" @@ -1906,11 +1910,14 @@ msgstr "spravuje okna" #, fuzzy msgid "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<value>[s|m|h|d|M|y] || scroll_horiz [+/-]<value>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" +"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " +"balance || merge [-window <number>] [all] || page_up|page_down [-window " +"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-" +"window <number>]" msgstr "" "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" "<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|" @@ -1928,6 +1935,7 @@ msgid "" " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" +" number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> percentage of parent " @@ -1964,7 +1972,9 @@ msgid "" " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom on window #2:\n" +" /window zoom -window 2" msgstr "" " list: vypíše otevřená okna (bez paramatru implikuje tenhle list)\n" " -1: přepne na přechozí okno\n" @@ -2027,6 +2037,10 @@ msgstr "vlastnosti, které mohou být nastaveny bufferu" msgid "properties that can be read on a buffer" msgstr "vlastnosti, které mohou být čteny o bufferu" +#, fuzzy +msgid "numbers of windows" +msgstr "seznam oken" + msgid "palette colors" msgstr "barvy palety" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-28 15:34+0200\n" +"POT-Creation-Date: 2011-07-29 19:41+0200\n" "PO-Revision-Date: 2011-07-14 20:53+0100\n" "Last-Translator: Nils Görs\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -196,8 +196,8 @@ msgid "%sError: unable to set option \"%s\" for bar \"%s\"" msgstr "" "%sFehler: Die Option \"%s\" kann für Infobar \"%s\" nicht gesetzt werden" -#, c-format -msgid "%sError: buffer not found for \"%s\" command" +#, fuzzy, c-format +msgid "%sError: window not found for \"%s\" command" msgstr "%sFehler: Buffer für den Befehl \"%s\" nicht gefunden" #, c-format @@ -801,6 +801,10 @@ msgstr[1] "mal" msgid "Windows list:" msgstr "Fensterliste:" +#, fuzzy, c-format +msgid "%sError: incorrect window number" +msgstr "%sFehler: falsche Buffer-Nummer" + #, c-format msgid "" "%sError: can not merge windows, there's no other window with same size near " @@ -826,11 +830,12 @@ msgstr "" msgid "manage bars" msgstr "Infobars verwalten" +#, fuzzy msgid "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" "status|nicklist] || del <name>|-all || set <name> <option> <value> || hide|" -"show|toggle <name> || scroll <name> <buffer> <scroll_value>" +"show|toggle <name> || scroll <name> <window> <scroll_value>" msgstr "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" @@ -868,8 +873,7 @@ msgid "" " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" -" buffer: name of buffer to scroll ('*' means current buffer, you " -"should use '*' for root bars)\n" +" window: window number (use '*' for current window or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', " "'-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to " "scroll by % of width/height, otherwise value is number of chars)\n" @@ -1995,12 +1999,16 @@ msgstr "" msgid "manage windows" msgstr "Fenster verwalten" +#, fuzzy msgid "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<value>[s|m|h|d|M|y] || scroll_horiz [+/-]<value>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" +"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " +"balance || merge [-window <number>] [all] || page_up|page_down [-window " +"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-" +"window <number>]" msgstr "" "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" "<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " @@ -2008,6 +2016,7 @@ msgstr "" "scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" "scroll_next_highlight || swap [up|down|left|right] || zoom" +#, fuzzy msgid "" " list: list opened windows (without argument, this list is " "displayed)\n" @@ -2018,6 +2027,7 @@ msgid "" " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" +" number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> percentage of parent " @@ -2054,7 +2064,9 @@ msgid "" " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom on window #2:\n" +" /window zoom -window 2" msgstr "" " list: listet die geöffneten Fenster (ohne Angabe von Parametern " "wird diese Funktion aufgerufen)\n" @@ -2124,6 +2136,10 @@ msgstr "Eigenschaften die für den Buffer gesetzt werden können" msgid "properties that can be read on a buffer" msgstr "Eigenschaften die für den Buffer gelesen werden können" +#, fuzzy +msgid "numbers of windows" +msgstr "Auflistung der Windows" + msgid "palette colors" msgstr "Farbpalette" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-28 15:34+0200\n" +"POT-Creation-Date: 2011-07-29 19:41+0200\n" "PO-Revision-Date: 2011-07-05 15:37+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -188,8 +188,8 @@ msgstr "Barra eliminada" msgid "%sError: unable to set option \"%s\" for bar \"%s\"" msgstr "%sError: no se pudo configurar la opción \"%s\" en la barra \"%s\"" -#, c-format -msgid "%sError: buffer not found for \"%s\" command" +#, fuzzy, c-format +msgid "%sError: window not found for \"%s\" command" msgstr "%sError: no se encontró el buffer para el comando \"%s\"" #, c-format @@ -786,6 +786,10 @@ msgstr[1] "veces" msgid "Windows list:" msgstr "Lista de ventanas:" +#, fuzzy, c-format +msgid "%sError: incorrect window number" +msgstr "%sError: número del buffer incorrecto" + #, c-format msgid "" "%sError: can not merge windows, there's no other window with same size near " @@ -812,11 +816,12 @@ msgstr "" msgid "manage bars" msgstr "gestionar las barras" +#, fuzzy msgid "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" "status|nicklist] || del <name>|-all || set <name> <option> <value> || hide|" -"show|toggle <name> || scroll <name> <buffer> <scroll_value>" +"show|toggle <name> || scroll <name> <window> <scroll_value>" msgstr "" "list|listfull|listitems || add <nombre> <tipo>[,<cond1>[,<cond2>...]] " "<posición> <tamaño> <separador> <elemento1>[,<elemento2>...] || default " @@ -855,8 +860,7 @@ msgid "" " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" -" buffer: name of buffer to scroll ('*' means current buffer, you " -"should use '*' for root bars)\n" +" window: window number (use '*' for current window or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', " "'-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to " "scroll by % of width/height, otherwise value is number of chars)\n" @@ -1926,11 +1930,14 @@ msgstr "gestión de ventanas" #, fuzzy msgid "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<value>[s|m|h|d|M|y] || scroll_horiz [+/-]<value>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" +"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " +"balance || merge [-window <number>] [all] || page_up|page_down [-window " +"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-" +"window <number>]" msgstr "" "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" "<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|" @@ -1948,6 +1955,7 @@ msgid "" " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" +" number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> percentage of parent " @@ -1984,7 +1992,9 @@ msgid "" " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom on window #2:\n" +" /window zoom -window 2" msgstr "" " list: lista las ventanas abiertas (si no hay argumentos se muestra esta " "lista)\n" @@ -2050,6 +2060,10 @@ msgstr "propiedades del buffer que pueden configurarse" msgid "properties that can be read on a buffer" msgstr "propiedades del buffer que pueden leerse" +#, fuzzy +msgid "numbers of windows" +msgstr "lista de ventanas" + msgid "palette colors" msgstr "paleta de colores" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-28 15:34+0200\n" -"PO-Revision-Date: 2011-07-28 14:58+0200\n" +"POT-Creation-Date: 2011-07-29 19:41+0200\n" +"PO-Revision-Date: 2011-07-29 19:42+0200\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: French\n" @@ -190,8 +190,8 @@ msgid "%sError: unable to set option \"%s\" for bar \"%s\"" msgstr "%sErreur: impossible de modifier l'option \"%s\" pour la barre \"%s\"" #, c-format -msgid "%sError: buffer not found for \"%s\" command" -msgstr "%sErreur: tampon non trouvé pour la commande \"%s\"" +msgid "%sError: window not found for \"%s\" command" +msgstr "%sErreur: fenêtre non trouvée pour la commande \"%s\"" #, c-format msgid "%sError: unable to scroll bar \"%s\"" @@ -790,6 +790,10 @@ msgid "Windows list:" msgstr "Liste des fenêtres:" #, c-format +msgid "%sError: incorrect window number" +msgstr "%sErreur: numéro de fenêtre incorrect" + +#, c-format msgid "" "%sError: can not merge windows, there's no other window with same size near " "current one" @@ -818,12 +822,12 @@ msgid "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" "status|nicklist] || del <name>|-all || set <name> <option> <value> || hide|" -"show|toggle <name> || scroll <name> <buffer> <scroll_value>" +"show|toggle <name> || scroll <name> <window> <scroll_value>" msgstr "" "list|listfull|listitems || add <nom> <type>[,<cond1>[,<cond2>...]] " "<position> <taille> <séparateur> <objet1>[,<objet2>...] || default [input|" "title|status|nicklist] || del <nom>|-all || set <nom> <option> <valeur> || " -"hide|show|toggle <nom> || scroll <nom> <tampon> <valeur_scroll>" +"hide|show|toggle <nom> || scroll <nom> <fenêtre> <valeur_scroll>" msgid "" " list: list all bars\n" @@ -855,8 +859,7 @@ msgid "" " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" -" buffer: name of buffer to scroll ('*' means current buffer, you " -"should use '*' for root bars)\n" +" window: window number (use '*' for current window or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', " "'-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to " "scroll by % of width/height, otherwise value is number of chars)\n" @@ -905,8 +908,8 @@ msgstr "" " show: montrer une barre cachée\n" " toggle: cacher/montrer une barre\n" " scroll: faire défiler la barre\n" -" tampon: catégorie et nom du tampon ('*' signifie le tampon courant, " -"vous devez utiliser '*' pour les barres de type root)\n" +" fenêtre: numéro de fenêtre (utilisez '*' pour la fenêtre courante ou " +"une barre de type root)\n" "valeur_scroll: valeur pour le défilement: 'x' ou 'y' (optionnel), suivi par " "'+', '-', 'b' (début) ou 'e' (fin), valeur (pour +/-), et un % optionnel " "(pour faire défiler par % de la largeur/hauteur, sinon la valeur est un " @@ -1991,17 +1994,23 @@ msgid "manage windows" msgstr "gestion des fenêtres" msgid "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<value>[s|m|h|d|M|y] || scroll_horiz [+/-]<value>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" +"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " +"balance || merge [-window <number>] [all] || page_up|page_down [-window " +"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-" +"window <number>]" msgstr "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<valeur>[s|m|h|d|M|y] || scroll_horiz [+/-]<valeur>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <numéro>] || <numéro> || splith|" +"splitv [-window <numéro>] [<pct>] || resize [-window <numéro>] [+/-]<pct> || " +"balance || merge [-window <numéro>] [all] || page_up|page_down [-window " +"<numéro>] || refresh || scroll [-window <numéro>] [+/-]<valeur>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <numéro>] [+/-]<valeur>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <numéro>] || swap [-window <numéro>] [up|down|left|right] || zoom [-" +"window <numéro>]" msgid "" " list: list opened windows (without argument, this list is " @@ -2013,6 +2022,7 @@ msgid "" " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" +" number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> percentage of parent " @@ -2049,7 +2059,9 @@ msgid "" " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom on window #2:\n" +" /window zoom -window 2" msgstr "" " list: lister les fenêtres ouvertes (sans paramètre, cette liste est " "affichée)\n" @@ -2060,6 +2072,7 @@ msgstr "" " down: sauter à la fenêtre au dessous\n" " left: sauter à la fenêtre à gauche\n" " right: sauter à la fenêtre à droite\n" +" numéro: numéro de fenêtre (voir /window list)\n" " splith: éclater la fenêtre en deux horizontalement\n" " splitv: éclater la fenêtre en deux verticalement\n" " resize: redimensionner une fenêtre, la nouvelle taille est <pct> " @@ -2097,7 +2110,9 @@ msgstr "" " défilement de 2 jours vers le haut:\n" " /window scroll -2d\n" " défilement jusqu'au début du jour courant:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom sur la fenêtre numéro 2:\n" +" /window zoom -window 2" #, c-format msgid "%sError: missing arguments for \"%s\" command" @@ -2118,6 +2133,9 @@ msgstr "propriétés qui peuvent être changées sur un tampon" msgid "properties that can be read on a buffer" msgstr "propriétés qui peuvent être lues sur un tampon" +msgid "numbers of windows" +msgstr "numéros des fenêtres" + msgid "palette colors" msgstr "couleurs de la palette" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-28 15:34+0200\n" +"POT-Creation-Date: 2011-07-29 19:41+0200\n" "PO-Revision-Date: 2011-05-15 10:51+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -192,7 +192,7 @@ msgid "%sError: unable to set option \"%s\" for bar \"%s\"" msgstr "%s ismeretlen opció a \"%s\" parancsnak\n" #, fuzzy, c-format -msgid "%sError: buffer not found for \"%s\" command" +msgid "%sError: window not found for \"%s\" command" msgstr "%s a(z) \"%s\". puffer nem található a(z) \"%s\" parancshoz\n" #, fuzzy, c-format @@ -825,6 +825,10 @@ msgid "Windows list:" msgstr "a /who lista vége" #, fuzzy, c-format +msgid "%sError: incorrect window number" +msgstr "%s helytelen pufferszám\n" + +#, fuzzy, c-format msgid "" "%sError: can not merge windows, there's no other window with same size near " "current one" @@ -855,7 +859,7 @@ msgid "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" "status|nicklist] || del <name>|-all || set <name> <option> <value> || hide|" -"show|toggle <name> || scroll <name> <buffer> <scroll_value>" +"show|toggle <name> || scroll <name> <window> <scroll_value>" msgstr "" msgid "" @@ -888,8 +892,7 @@ msgid "" " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" -" buffer: name of buffer to scroll ('*' means current buffer, you " -"should use '*' for root bars)\n" +" window: window number (use '*' for current window or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', " "'-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to " "scroll by % of width/height, otherwise value is number of chars)\n" @@ -1616,11 +1619,14 @@ msgstr "ablakok kezelése" #, fuzzy msgid "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<value>[s|m|h|d|M|y] || scroll_horiz [+/-]<value>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" +"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " +"balance || merge [-window <number>] [all] || page_up|page_down [-window " +"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-" +"window <number>]" msgstr "" "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv " "[pct] | resize pct | merge [all]]" @@ -1636,6 +1642,7 @@ msgid "" " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" +" number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> percentage of parent " @@ -1672,7 +1679,9 @@ msgid "" " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom on window #2:\n" +" /window zoom -window 2" msgstr "" " list: nyitott ablakok listája (paraméter nélkül ez hívódik meg)\n" " -1: ugrás az előző ablakra\n" @@ -1715,6 +1724,10 @@ msgid "properties that can be read on a buffer" msgstr "puffer betöltése sikertelen" #, fuzzy +msgid "numbers of windows" +msgstr "Mellőzések listája:\n" + +#, fuzzy msgid "palette colors" msgstr "Alapértelmezett billentyűparancsok visszaállítva\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-28 15:34+0200\n" +"POT-Creation-Date: 2011-07-29 19:41+0200\n" "PO-Revision-Date: 2011-07-16 11:32+0200\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -187,8 +187,8 @@ msgstr "Barra eliminata" msgid "%sError: unable to set option \"%s\" for bar \"%s\"" msgstr "%sErrore: impossibile impostare l'opzione \"%s\" per la barra \"%s\"" -#, c-format -msgid "%sError: buffer not found for \"%s\" command" +#, fuzzy, c-format +msgid "%sError: window not found for \"%s\" command" msgstr "%sErrore: buffer non trovato per il comando \"%s\"" #, c-format @@ -784,6 +784,10 @@ msgstr[1] "volte" msgid "Windows list:" msgstr "Elenco delle finestre:" +#, fuzzy, c-format +msgid "%sError: incorrect window number" +msgstr "%sErrore: nome buffer non corretto" + #, c-format msgid "" "%sError: can not merge windows, there's no other window with same size near " @@ -809,11 +813,12 @@ msgstr "" msgid "manage bars" msgstr "gestione barre" +#, fuzzy msgid "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" "status|nicklist] || del <name>|-all || set <name> <option> <value> || hide|" -"show|toggle <name> || scroll <name> <buffer> <scroll_value>" +"show|toggle <name> || scroll <name> <window> <scroll_value>" msgstr "" "list|listfull|listitems || add <nome> <tipo>[,<cond1>[,<cond2>...]] " "<posizione> <dimensione> <separatore> <elemento1>[,<elemento2>...] || " @@ -852,8 +857,7 @@ msgid "" " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" -" buffer: name of buffer to scroll ('*' means current buffer, you " -"should use '*' for root bars)\n" +" window: window number (use '*' for current window or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', " "'-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to " "scroll by % of width/height, otherwise value is number of chars)\n" @@ -1938,12 +1942,16 @@ msgstr "" msgid "manage windows" msgstr "gestione finestre" +#, fuzzy msgid "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<value>[s|m|h|d|M|y] || scroll_horiz [+/-]<value>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" +"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " +"balance || merge [-window <number>] [all] || page_up|page_down [-window " +"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-" +"window <number>]" msgstr "" "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-] " "<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|" @@ -1951,6 +1959,7 @@ msgstr "" "scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" "scroll_next_highlight || swap [up|down|left|right] || zoom" +#, fuzzy msgid "" " list: list opened windows (without argument, this list is " "displayed)\n" @@ -1961,6 +1970,7 @@ msgid "" " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" +" number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> percentage of parent " @@ -1997,7 +2007,9 @@ msgid "" " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom on window #2:\n" +" /window zoom -window 2" msgstr "" " list: elenca le finestre aperte (senza argomento, questa lista " "viene visualizzata)\n" @@ -2068,6 +2080,10 @@ msgstr "proprietà che possono essere impostate su un buffer" msgid "properties that can be read on a buffer" msgstr "proprietà che possono essere lette su un buffer" +#, fuzzy +msgid "numbers of windows" +msgstr "elenco delle finestre" + msgid "palette colors" msgstr "Tavolozza dei colori" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-28 15:34+0200\n" +"POT-Creation-Date: 2011-07-29 19:41+0200\n" "PO-Revision-Date: 2011-07-05 15:38+0200\n" "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -190,8 +190,8 @@ msgstr "Pasek usunięty" msgid "%sError: unable to set option \"%s\" for bar \"%s\"" msgstr "%sBłąd: nie można ustawić opcji \"%s\" dla paska \"%s\"" -#, c-format -msgid "%sError: buffer not found for \"%s\" command" +#, fuzzy, c-format +msgid "%sError: window not found for \"%s\" command" msgstr "%sBłąd: nie znaleziono bufora dla komendy \"%s\"" #, c-format @@ -795,6 +795,10 @@ msgstr[2] "razy" msgid "Windows list:" msgstr "Lista okien:" +#, fuzzy, c-format +msgid "%sError: incorrect window number" +msgstr "%sBłąd: nieprawidłowy numer buforu" + #, c-format msgid "" "%sError: can not merge windows, there's no other window with same size near " @@ -820,11 +824,12 @@ msgstr "" msgid "manage bars" msgstr "zarządzaj paskami" +#, fuzzy msgid "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" "status|nicklist] || del <name>|-all || set <name> <option> <value> || hide|" -"show|toggle <name> || scroll <name> <buffer> <scroll_value>" +"show|toggle <name> || scroll <name> <window> <scroll_value>" msgstr "" "list|listfull|listitems || add <nazwa> <typ>[,<warunek1>[,<warunek2>...]] " "<pozycja> <rozmiar> <separator> <element1>[,<element2>...] || default [input|" @@ -862,8 +867,7 @@ msgid "" " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" -" buffer: name of buffer to scroll ('*' means current buffer, you " -"should use '*' for root bars)\n" +" window: window number (use '*' for current window or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', " "'-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to " "scroll by % of width/height, otherwise value is number of chars)\n" @@ -1928,11 +1932,14 @@ msgstr "zarządza oknami" #, fuzzy msgid "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<value>[s|m|h|d|M|y] || scroll_horiz [+/-]<value>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" +"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " +"balance || merge [-window <number>] [all] || page_up|page_down [-window " +"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-" +"window <number>]" msgstr "" "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" "<pct> || balance || merge [all] || page_up|page_down || refresh || scroll|" @@ -1950,6 +1957,7 @@ msgid "" " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" +" number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> percentage of parent " @@ -1986,7 +1994,9 @@ msgid "" " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom on window #2:\n" +" /window zoom -window 2" msgstr "" " list: lista otwartych okien (bez argumentu wyświetlana jest ta " "lista)\n" @@ -2051,6 +2061,10 @@ msgstr "właściwości, jakie mogą być ustawione w buforze" msgid "properties that can be read on a buffer" msgstr "właściwości, jakie moga być przeczytane w buforze" +#, fuzzy +msgid "numbers of windows" +msgstr "lista okien" + msgid "palette colors" msgstr "paleta kolorów" diff --git a/po/pt_BR.po b/po/pt_BR.po index 866289317..c5df198f5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-28 15:34+0200\n" +"POT-Creation-Date: 2011-07-29 19:41+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -189,8 +189,8 @@ msgstr "Barra deletada" msgid "%sError: unable to set option \"%s\" for bar \"%s\"" msgstr "%sErro: incapaz de configurar a opção \"%s\" para a barra \"%s\"" -#, c-format -msgid "%sError: buffer not found for \"%s\" command" +#, fuzzy, c-format +msgid "%sError: window not found for \"%s\" command" msgstr "%sErro: buffer não foi encontrado para o comando \"%s\"" #, fuzzy, c-format @@ -796,6 +796,10 @@ msgstr[1] "vezes" msgid "Windows list:" msgstr "Lista de janelas:" +#, fuzzy, c-format +msgid "%sError: incorrect window number" +msgstr "%sErro: número do buffer incorreto" + #, c-format msgid "" "%sError: can not merge windows, there's no other window with same size near " @@ -827,7 +831,7 @@ msgid "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" "status|nicklist] || del <name>|-all || set <name> <option> <value> || hide|" -"show|toggle <name> || scroll <name> <buffer> <scroll_value>" +"show|toggle <name> || scroll <name> <window> <scroll_value>" msgstr "" "[add barname type[,cond1,cond2,...] position size separator item1,item2,...] " "| [default] | [del barname|-all] | [set barname option value] | [hide|show|" @@ -866,8 +870,7 @@ msgid "" " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" -" buffer: name of buffer to scroll ('*' means current buffer, you " -"should use '*' for root bars)\n" +" window: window number (use '*' for current window or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', " "'-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to " "scroll by % of width/height, otherwise value is number of chars)\n" @@ -1921,11 +1924,14 @@ msgstr "gerencia janelas" #, fuzzy msgid "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<value>[s|m|h|d|M|y] || scroll_horiz [+/-]<value>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" +"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " +"balance || merge [-window <number>] [all] || page_up|page_down [-window " +"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-" +"window <number>]" msgstr "" "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv " "[pct] | resize pct | merge [all] | page_up | page_down | refresh | scroll | " @@ -1943,6 +1949,7 @@ msgid "" " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" +" number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> percentage of parent " @@ -1979,7 +1986,9 @@ msgid "" " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom on window #2:\n" +" /window zoom -window 2" msgstr "" " list: lista janelas abertas (sem argumentos, esta lista é " "mostrada)\n" @@ -2042,6 +2051,10 @@ msgid "properties that can be read on a buffer" msgstr "propriedades que podem ser lidas em um buffer" #, fuzzy +msgid "numbers of windows" +msgstr "Restauração da disposição das janelas" + +#, fuzzy msgid "palette colors" msgstr "comando padrão:" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-28 15:34+0200\n" +"POT-Creation-Date: 2011-07-29 19:41+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -195,7 +195,7 @@ msgid "%sError: unable to set option \"%s\" for bar \"%s\"" msgstr "%s неизвестный параметр для команды \"%s\"\n" #, fuzzy, c-format -msgid "%sError: buffer not found for \"%s\" command" +msgid "%sError: window not found for \"%s\" command" msgstr "%s буфер номер \"%s\" не найден для команды \"%s\"\n" #, fuzzy, c-format @@ -833,6 +833,10 @@ msgid "Windows list:" msgstr "конец списка /who" #, fuzzy, c-format +msgid "%sError: incorrect window number" +msgstr "%s неправильный номер буфера\n" + +#, fuzzy, c-format msgid "" "%sError: can not merge windows, there's no other window with same size near " "current one" @@ -862,7 +866,7 @@ msgid "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" "status|nicklist] || del <name>|-all || set <name> <option> <value> || hide|" -"show|toggle <name> || scroll <name> <buffer> <scroll_value>" +"show|toggle <name> || scroll <name> <window> <scroll_value>" msgstr "" msgid "" @@ -895,8 +899,7 @@ msgid "" " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" -" buffer: name of buffer to scroll ('*' means current buffer, you " -"should use '*' for root bars)\n" +" window: window number (use '*' for current window or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', " "'-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to " "scroll by % of width/height, otherwise value is number of chars)\n" @@ -1625,11 +1628,14 @@ msgstr "управление окнами" #, fuzzy msgid "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<value>[s|m|h|d|M|y] || scroll_horiz [+/-]<value>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" +"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " +"balance || merge [-window <number>] [all] || page_up|page_down [-window " +"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-" +"window <number>]" msgstr "" "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv " "[pct] | resize pct | merge [all]]" @@ -1645,6 +1651,7 @@ msgid "" " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" +" number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> percentage of parent " @@ -1681,7 +1688,9 @@ msgid "" " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom on window #2:\n" +" /window zoom -window 2" msgstr "" " list: перечислить открытые окна (отсутствие параметров подразумевает этот " "список)\n" @@ -1724,6 +1733,10 @@ msgid "properties that can be read on a buffer" msgstr "загрузка буфера не удалась" #, fuzzy +msgid "numbers of windows" +msgstr "Список игнорирования:\n" + +#, fuzzy msgid "palette colors" msgstr "Комбинации клавиш по умолчанию восстановлены\n" diff --git a/po/weechat.pot b/po/weechat.pot index e67c11d3d..117d65bbf 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-28 15:34+0200\n" +"POT-Creation-Date: 2011-07-29 19:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -154,7 +154,7 @@ msgid "%sError: unable to set option \"%s\" for bar \"%s\"" msgstr "" #, c-format -msgid "%sError: buffer not found for \"%s\" command" +msgid "%sError: window not found for \"%s\" command" msgstr "" #, c-format @@ -732,6 +732,10 @@ msgid "Windows list:" msgstr "" #, c-format +msgid "%sError: incorrect window number" +msgstr "" + +#, c-format msgid "" "%sError: can not merge windows, there's no other window with same size near " "current one" @@ -755,7 +759,7 @@ msgid "" "list|listfull|listitems || add <name> <type>[,<cond1>[,<cond2>...]] " "<position> <size> <separator> <item1>[,<item2>...] || default [input|title|" "status|nicklist] || del <name>|-all || set <name> <option> <value> || hide|" -"show|toggle <name> || scroll <name> <buffer> <scroll_value>" +"show|toggle <name> || scroll <name> <window> <scroll_value>" msgstr "" msgid "" @@ -788,8 +792,7 @@ msgid "" " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" -" buffer: name of buffer to scroll ('*' means current buffer, you " -"should use '*' for root bars)\n" +" window: window number (use '*' for current window or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), followed by '+', " "'-', 'b' (beginning) or 'e' (end), value (for +/-), and optional % (to " "scroll by % of width/height, otherwise value is number of chars)\n" @@ -1431,11 +1434,14 @@ msgid "manage windows" msgstr "" msgid "" -"list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize [+/-]" -"<pct> || balance || merge [all] || page_up|page_down || refresh || scroll " -"[+/-]<value>[s|m|h|d|M|y] || scroll_horiz [+/-]<value>[%] || scroll_up|" -"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" -"scroll_next_highlight || swap [up|down|left|right] || zoom" +"list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" +"splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " +"balance || merge [-window <number>] [all] || page_up|page_down [-window " +"<number>] || refresh || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] " +"|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" +"scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight [-" +"window <number>] || swap [-window <number>] [up|down|left|right] || zoom[-" +"window <number>]" msgstr "" msgid "" @@ -1448,6 +1454,7 @@ msgid "" " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" +" number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> percentage of parent " @@ -1484,7 +1491,9 @@ msgid "" " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" -" /window scroll -d" +" /window scroll -d\n" +" zoom on window #2:\n" +" /window zoom -window 2" msgstr "" #, c-format @@ -1506,6 +1515,9 @@ msgstr "" msgid "properties that can be read on a buffer" msgstr "" +msgid "numbers of windows" +msgstr "" + msgid "palette colors" msgstr "" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index d5dc38ed2..c7268dbe9 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -155,14 +155,15 @@ command_bar_list (int full) COMMAND_CALLBACK(bar) { - int i, type, position; + int i, type, position, number; char *error, *str_type, *pos_condition; struct t_gui_bar *ptr_bar; struct t_gui_bar_item *ptr_item; - struct t_gui_buffer *ptr_buffer; + struct t_gui_window *ptr_window; /* make C compiler happy */ (void) data; + (void) buffer; /* list of bars */ if ((argc == 1) @@ -432,17 +433,23 @@ COMMAND_CALLBACK(bar) if (ptr_bar) { if (strcmp (argv[3], "*") == 0) - ptr_buffer = buffer; + ptr_window = gui_current_window; else - ptr_buffer = gui_buffer_search_by_full_name (argv[3]); - if (!ptr_buffer) + { + ptr_window = NULL; + error = NULL; + number = (int)strtol (argv[3], &error, 10); + if (error && !error[0]) + ptr_window = gui_window_search_by_number (number); + } + if (!ptr_window) { gui_chat_printf (NULL, - _("%sError: buffer not found for \"%s\" command"), + _("%sError: window not found for \"%s\" command"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], "bar"); return WEECHAT_RC_OK; } - if (!gui_bar_scroll (ptr_bar, ptr_buffer, argv_eol[4])) + if (!gui_bar_scroll (ptr_bar, ptr_window, argv_eol[4])) { gui_chat_printf (NULL, _("%sError: unable to scroll bar \"%s\""), @@ -4695,9 +4702,9 @@ COMMAND_CALLBACK(wait) COMMAND_CALLBACK(window) { struct t_gui_window *ptr_win; - int i; char *error; long number; + int win_args; /* make C compiler happy */ (void) data; @@ -4711,13 +4718,12 @@ COMMAND_CALLBACK(window) gui_chat_printf (NULL, ""); gui_chat_printf (NULL, _("Windows list:")); - i = 1; for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) { gui_chat_printf (NULL, "%s[%s%d%s] (%s%d:%d%s;%s%dx%d%s) ", GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS), GUI_COLOR(GUI_COLOR_CHAT), - i, + ptr_win->number, GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS), GUI_COLOR(GUI_COLOR_CHAT), ptr_win->win_x, @@ -4727,173 +4733,201 @@ COMMAND_CALLBACK(window) ptr_win->win_width, ptr_win->win_height, GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS)); - i++; } - + + return WEECHAT_RC_OK; + } + + /* refresh screen */ + if (string_strcasecmp (argv[1], "refresh") == 0) + { + gui_window_ask_refresh (2); + return WEECHAT_RC_OK; + } + + /* balance windows */ + if (string_strcasecmp (argv[1], "balance") == 0) + { + if (gui_window_balance (gui_windows_tree)) + gui_window_ask_refresh (1); + return WEECHAT_RC_OK; + } + + /* + * search window, for actions related to a given window + * (default is current window if no number is given) + */ + ptr_win = gui_current_window; + win_args = 2; + if ((argc > 3) && (string_strcasecmp (argv[2], "-window") == 0)) + { + error = NULL; + number = strtol (argv[3], &error, 10); + if (error && !error[0]) + ptr_win = gui_window_search_by_number (number); + else + ptr_win = NULL; + win_args = 4; + } + if (!ptr_win) + { + /* invalid number */ + gui_chat_printf (NULL, + _("%sError: incorrect window number"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); return WEECHAT_RC_OK; } - /* page up in current window */ + /* page up */ if (string_strcasecmp (argv[1], "page_up") == 0) { - gui_window_page_up (gui_current_window); + gui_window_page_up (ptr_win); return WEECHAT_RC_OK; } - /* page down in current window */ + /* page down */ if (string_strcasecmp (argv[1], "page_down") == 0) { - gui_window_page_down (gui_current_window); + gui_window_page_down (ptr_win); return WEECHAT_RC_OK; } - /* vertical scroll in window */ + /* vertical scroll */ if (string_strcasecmp (argv[1], "scroll") == 0) { - if (argc > 2) - gui_window_scroll (gui_current_window, argv[2]); + if (argc > win_args) + gui_window_scroll (ptr_win, argv[win_args]); return WEECHAT_RC_OK; } /* horizontal scroll in window (for buffers with free content) */ if (string_strcasecmp (argv[1], "scroll_horiz") == 0) { - if ((argc > 2) - && (gui_current_window->buffer->type == GUI_BUFFER_TYPE_FREE)) + if ((argc > win_args) + && (ptr_win->buffer->type == GUI_BUFFER_TYPE_FREE)) { - gui_window_scroll_horiz (gui_current_window, argv[2]); + gui_window_scroll_horiz (ptr_win, argv[win_args]); } return WEECHAT_RC_OK; } - /* scroll up current window */ + /* scroll up */ if (string_strcasecmp (argv[1], "scroll_up") == 0) { - gui_window_scroll_up (gui_current_window); + gui_window_scroll_up (ptr_win); return WEECHAT_RC_OK; } - /* scroll down current window */ + /* scroll down */ if (string_strcasecmp (argv[1], "scroll_down") == 0) { - gui_window_scroll_down (gui_current_window); + gui_window_scroll_down (ptr_win); return WEECHAT_RC_OK; } - /* scroll to top of current window */ + /* scroll to top of window */ if (string_strcasecmp (argv[1], "scroll_top") == 0) { - gui_window_scroll_top (gui_current_window); + gui_window_scroll_top (ptr_win); return WEECHAT_RC_OK; } - /* scroll to bottom of current window */ + /* scroll to bottom of window */ if (string_strcasecmp (argv[1], "scroll_bottom") == 0) { - gui_window_scroll_bottom (gui_current_window); + gui_window_scroll_bottom (ptr_win); return WEECHAT_RC_OK; } - /* scroll to previous highlight of current window */ + /* scroll to previous highlight */ if (string_strcasecmp (argv[1], "scroll_previous_highlight") == 0) { - gui_window_scroll_previous_highlight (gui_current_window); + gui_window_scroll_previous_highlight (ptr_win); return WEECHAT_RC_OK; } - /* scroll to next highlight of current window */ + /* scroll to next highlight */ if (string_strcasecmp (argv[1], "scroll_next_highlight") == 0) { - gui_window_scroll_next_highlight (gui_current_window); - return WEECHAT_RC_OK; - } - - /* refresh screen */ - if (string_strcasecmp (argv[1], "refresh") == 0) - { - gui_window_ask_refresh (2); + gui_window_scroll_next_highlight (ptr_win); return WEECHAT_RC_OK; } /* split window horizontally */ if (string_strcasecmp (argv[1], "splith") == 0) { - if (argc > 2) + if (argc > win_args) { error = NULL; - number = strtol (argv[2], &error, 10); + number = strtol (argv[win_args], &error, 10); if (error && !error[0] && (number > 0) && (number < 100)) - gui_window_split_horizontal (gui_current_window, number); + { + gui_window_split_horizontal (ptr_win, number); + } } else - gui_window_split_horizontal (gui_current_window, 50); - + gui_window_split_horizontal (ptr_win, 50); + return WEECHAT_RC_OK; } /* split window vertically */ if (string_strcasecmp (argv[1], "splitv") == 0) { - if (argc > 2) + if (argc > win_args) { error = NULL; - number = strtol (argv[2], &error, 10); + number = strtol (argv[win_args], &error, 10); if (error && !error[0] && (number > 0) && (number < 100)) - gui_window_split_vertical (gui_current_window, number); + { + gui_window_split_vertical (ptr_win, number); + } } else - gui_window_split_vertical (gui_current_window, 50); - + gui_window_split_vertical (ptr_win, 50); + return WEECHAT_RC_OK; } /* resize window */ if (string_strcasecmp (argv[1], "resize") == 0) { - if (argc > 2) + if (argc > win_args) { - if ((argv[2][0] == '+') || (argv[2][0] == '-')) + if ((argv[win_args][0] == '+') || (argv[win_args][0] == '-')) { error = NULL; - number = strtol (argv[2] + 1, &error, 10); + number = strtol (argv[win_args] + 1, &error, 10); if (error && !error[0]) { - if (argv[2][0] == '-') + if (argv[win_args][0] == '-') number *= -1; - gui_window_resize_delta (gui_current_window, number); + gui_window_resize_delta (ptr_win, number); } } else { error = NULL; - number = strtol (argv[2], &error, 10); + number = strtol (argv[win_args], &error, 10); if (error && !error[0] && (number > 0) && (number < 100)) { - gui_window_resize (gui_current_window, number); + gui_window_resize (ptr_win, number); } } } return WEECHAT_RC_OK; } - /* balance windows */ - if (string_strcasecmp (argv[1], "balance") == 0) - { - if (gui_window_balance (gui_windows_tree)) - gui_window_ask_refresh (1); - return WEECHAT_RC_OK; - } - /* merge windows */ if (string_strcasecmp (argv[1], "merge") == 0) { - if (argc > 2) + if (argc > win_args) { - if (string_strcasecmp (argv[2], "all") == 0) - gui_window_merge_all (gui_current_window); + if (string_strcasecmp (argv[win_args], "all") == 0) + gui_window_merge_all (ptr_win); else { gui_chat_printf (NULL, @@ -4906,7 +4940,7 @@ COMMAND_CALLBACK(window) } else { - if (!gui_window_merge (gui_current_window)) + if (!gui_window_merge (ptr_win)) { gui_chat_printf (NULL, _("%sError: can not merge windows, " @@ -4922,58 +4956,58 @@ COMMAND_CALLBACK(window) /* switch to previous window */ if (string_strcasecmp (argv[1], "-1") == 0) { - gui_window_switch_previous (gui_current_window); + gui_window_switch_previous (ptr_win); return WEECHAT_RC_OK; } /* switch to next window */ if (string_strcasecmp (argv[1], "+1") == 0) { - gui_window_switch_next (gui_current_window); + gui_window_switch_next (ptr_win); return WEECHAT_RC_OK; } /* switch to window above */ if (string_strcasecmp (argv[1], "up") == 0) { - gui_window_switch_up (gui_current_window); + gui_window_switch_up (ptr_win); return WEECHAT_RC_OK; } /* switch to window below */ if (string_strcasecmp (argv[1], "down") == 0) { - gui_window_switch_down (gui_current_window); + gui_window_switch_down (ptr_win); return WEECHAT_RC_OK; } /* switch to window on the left */ if (string_strcasecmp (argv[1], "left") == 0) { - gui_window_switch_left (gui_current_window); + gui_window_switch_left (ptr_win); return WEECHAT_RC_OK; } /* switch to window on the right */ if (string_strcasecmp (argv[1], "right") == 0) { - gui_window_switch_right (gui_current_window); + gui_window_switch_right (ptr_win); return WEECHAT_RC_OK; } /* swap windows */ if (string_strcasecmp (argv[1], "swap") == 0) { - if (argc > 2) + if (argc > win_args) { - if (string_strcasecmp (argv[2], "up") == 0) - gui_window_swap (gui_current_window, 1); - else if (string_strcasecmp (argv[2], "down") == 0) - gui_window_swap (gui_current_window, 3); - else if (string_strcasecmp (argv[2], "left") == 0) - gui_window_swap (gui_current_window, 4); - else if (string_strcasecmp (argv[2], "right") == 0) - gui_window_swap (gui_current_window, 2); + if (string_strcasecmp (argv[win_args], "up") == 0) + gui_window_swap (ptr_win, 1); + else if (string_strcasecmp (argv[win_args], "down") == 0) + gui_window_swap (ptr_win, 3); + else if (string_strcasecmp (argv[win_args], "left") == 0) + gui_window_swap (ptr_win, 4); + else if (string_strcasecmp (argv[win_args], "right") == 0) + gui_window_swap (ptr_win, 2); else { gui_chat_printf (NULL, @@ -4986,7 +5020,7 @@ COMMAND_CALLBACK(window) } else { - gui_window_swap (gui_current_window, 0); + gui_window_swap (ptr_win, 0); } return WEECHAT_RC_OK; } @@ -4994,7 +5028,7 @@ COMMAND_CALLBACK(window) /* zoom window */ if (string_strcasecmp (argv[1], "zoom") == 0) { - gui_window_zoom (gui_current_window); + gui_window_zoom (ptr_win); return WEECHAT_RC_OK; } @@ -5005,11 +5039,20 @@ COMMAND_CALLBACK(window) number = strtol (argv[1] + 1, &error, 10); if (error && !error[0]) { - gui_window_switch_by_buffer (gui_current_window, number); + gui_window_switch_by_buffer (ptr_win, number); return WEECHAT_RC_OK; } } + /* jump to window by number */ + error = NULL; + number = strtol (argv[1], &error, 10); + if (error && !error[0]) + { + gui_window_switch_by_number (number); + return WEECHAT_RC_OK; + } + gui_chat_printf (NULL, _("%sError: unknown option for \"%s\" " "command"), @@ -5042,7 +5085,7 @@ command_init () " || del <name>|-all" " || set <name> <option> <value>" " || hide|show|toggle <name>" - " || scroll <name> <buffer> <scroll_value>"), + " || scroll <name> <window> <scroll_value>"), N_(" list: list all bars\n" " listfull: list all bars (verbose)\n" " listitems: list all bar items\n" @@ -5074,8 +5117,8 @@ command_init () " show: show an hidden bar\n" " toggle: hide/show a bar\n" " scroll: scroll bar\n" - " buffer: name of buffer to scroll ('*' " - "means current buffer, you should use '*' for root bars)\n" + " window: window number (use '*' for current window " + "or for root bars)\n" " scroll_value: value for scroll: 'x' or 'y' (optional), " "followed by '+', '-', 'b' (beginning) or 'e' (end), " "value (for +/-), and optional % (to scroll by % of " @@ -5101,7 +5144,7 @@ command_init () " || hide %(bars_names)" " || show %(bars_names)" " || toggle %(bars_names)" - " || scroll %(bars_names) %(buffers_plugins_names)|*", + " || scroll %(bars_names) %(windows_numbers)|*", &command_bar, NULL); hook_command (NULL, "buffer", N_("manage buffers"), @@ -5749,20 +5792,21 @@ command_init () hook_command (NULL, "window", N_("manage windows"), N_("list" - " || -1|+1|b#|up|down|left|right" - " || splith|splitv [<pct>]" - " || resize [+/-]<pct>" + " || -1|+1|b#|up|down|left|right [-window <number>]" + " || <number>" + " || splith|splitv [-window <number>] [<pct>]" + " || resize [-window <number>] [+/-]<pct>" " || balance" - " || merge [all]" - " || page_up|page_down" + " || merge [-window <number>] [all]" + " || page_up|page_down [-window <number>]" " || refresh" - " || scroll [+/-]<value>[s|m|h|d|M|y]" - " || scroll_horiz [+/-]<value>[%]" + " || scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y]" + " || scroll_horiz [-window <number>] [+/-]<value>[%]" " || scroll_up|scroll_down|scroll_top|" "scroll_bottom|scroll_previous_highlight|" - "scroll_next_highlight" - " || swap [up|down|left|right]" - " || zoom"), + "scroll_next_highlight [-window <number>]" + " || swap [-window <number>] [up|down|left|right]" + " || zoom[-window <number>]"), N_(" list: list opened windows (without argument, " "this list is displayed)\n" " -1: jump to previous window\n" @@ -5772,6 +5816,7 @@ command_init () " down: switch to window below current one\n" " left: switch to window on the left\n" " right: switch to window on the right\n" + " number: window number (see /window list)\n" " splith: split current window horizontally\n" " splitv: split current window vertically\n" " resize: resize window size, new size is <pct> " @@ -5808,13 +5853,34 @@ command_init () " scroll 2 days up:\n" " /window scroll -2d\n" " scroll to beginning of current day:\n" - " /window scroll -d"), - "list || -1 || +1 || up || down || left || right" - " || splith || splitv || resize || balance || page_up" - " || page_down || refresh || scroll || scroll_horiz" - " || scroll_up || scroll_down || scroll_top || scroll_bottom" - " || scroll_previous_highlight || scroll_next_highlight" - " || swap up|down|left|right || zoom || merge all", + " /window scroll -d\n" + " zoom on window #2:\n" + " /window zoom -window 2"), + "list" + " || -1 -window %(windows_numbers)" + " || +1 -window %(windows_numbers)" + " || up -window %(windows_numbers)" + " || down -window %(windows_numbers)" + " || left -window %(windows_numbers)" + " || right -window %(windows_numbers)" + " || splith -window %(windows_numbers)" + " || splitv -window %(windows_numbers)" + " || resize -window %(windows_numbers)" + " || balance" + " || page_up -window %(windows_numbers)" + " || page_down -window %(windows_numbers)" + " || refresh" + " || scroll -window" + " || scroll_horiz -window %(windows_numbers)" + " || scroll_up -window %(windows_numbers)" + " || scroll_down -window %(windows_numbers)" + " || scroll_top -window %(windows_numbers)" + " || scroll_bottom -window %(windows_numbers)" + " || scroll_previous_highlight -window %(windows_numbers)" + " || scroll_next_highlight -window %(windows_numbers)" + " || swap up|down|left|right|-window %(windows_numbers)" + " || zoom -window %(windows_numbers)" + " || merge all|-window %(windows_numbers)", &command_window, NULL); } diff --git a/src/core/wee-completion.c b/src/core/wee-completion.c index 7879fa4da..15ccc05e5 100644 --- a/src/core/wee-completion.c +++ b/src/core/wee-completion.c @@ -263,6 +263,34 @@ completion_list_add_buffer_properties_get_cb (void *data, } /* + * completion_list_add_windows_numbers_cb: add windows numbers to completion list + */ + +int +completion_list_add_windows_numbers_cb (void *data, + const char *completion_item, + struct t_gui_buffer *buffer, + struct t_gui_completion *completion) +{ + struct t_gui_window *ptr_win; + char str_number[32]; + + /* make C compiler happy */ + (void) data; + (void) completion_item; + (void) buffer; + + for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + { + snprintf (str_number, sizeof (str_number), "%d", ptr_win->number); + gui_completion_list_add (completion, str_number, + 0, WEECHAT_LIST_POS_END); + } + + return WEECHAT_RC_OK; +} + +/* * completion_list_map_add_palette_color_cb: add palette color in completion */ @@ -1290,6 +1318,9 @@ completion_init () hook_completion (NULL, "buffer_properties_get", N_("properties that can be read on a buffer"), &completion_list_add_buffer_properties_get_cb, NULL); + hook_completion (NULL, "windows_numbers", + N_("numbers of windows"), + &completion_list_add_windows_numbers_cb, NULL); hook_completion (NULL, "palette_colors", N_("palette colors"), &completion_list_add_palette_colors_cb, NULL); diff --git a/src/core/wee-hook.c b/src/core/wee-hook.c index 89005dea7..88b656ac4 100644 --- a/src/core/wee-hook.c +++ b/src/core/wee-hook.c @@ -51,6 +51,7 @@ #include "../gui/gui-chat.h" #include "../gui/gui-bar.h" #include "../gui/gui-bar-window.h" +#include "../gui/gui-buffer.h" #include "../gui/gui-color.h" #include "../gui/gui-completion.h" #include "../gui/gui-cursor.h" @@ -2839,6 +2840,19 @@ hook_focus_get_data (struct t_gui_cursor_info *cursor_info) (cursor_info->window) ? (long unsigned int)((cursor_info->window)->buffer) : 0); hashtable_set (hash_info, "_buffer", str_value); + if (cursor_info->window) + { + snprintf (str_value, sizeof (str_value), "%d", + (cursor_info->window)->number); + hashtable_set (hash_info, "_window_number", str_value); + snprintf (str_value, sizeof (str_value), "%d", + ((cursor_info->window)->buffer)->number); + hashtable_set (hash_info, "_buffer_number", str_value); + hashtable_set (hash_info, "_buffer_plugin", + plugin_get_name (((cursor_info->window)->buffer)->plugin)); + hashtable_set (hash_info, "_buffer_name", + ((cursor_info->window)->buffer)->name); + } hashtable_set (hash_info, "_bar_name", (cursor_info->bar_window) ? ((cursor_info->bar_window)->bar)->name : NULL); diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c index 6edc6d797..ce19de112 100644 --- a/src/gui/curses/gui-curses-key.c +++ b/src/gui/curses/gui-curses-key.c @@ -237,34 +237,35 @@ gui_key_default_bindings (int context) BIND(/* m-left */ "meta2-1;3D", "/cursor move area_left"); BIND(/* m-right */ "meta-meta2-C", "/cursor move area_right"); BIND(/* m-right */ "meta2-1;3C", "/cursor move area_right"); - BIND(/* b */ "@item(buffer_nicklist):b", "/ban ${nick}"); - BIND(/* k */ "@item(buffer_nicklist):k", "/kick ${nick}"); - BIND(/* K */ "@item(buffer_nicklist):K", "/kickban ${nick}"); - BIND(/* q */ "@item(buffer_nicklist):q", "/query ${nick};/cursor stop"); - BIND(/* w */ "@item(buffer_nicklist):w", "/whois ${nick}"); + BIND(/* b */ "@item(buffer_nicklist):b", "/window ${_window_number};/ban ${nick}"); + BIND(/* k */ "@item(buffer_nicklist):k", "/window ${_window_number};/kick ${nick}"); + BIND(/* K */ "@item(buffer_nicklist):K", "/window ${_window_number};/kickban ${nick}"); + BIND(/* q */ "@item(buffer_nicklist):q", "/window ${_window_number};/query ${nick};/cursor stop"); + BIND(/* w */ "@item(buffer_nicklist):w", "/window ${_window_number};/whois ${nick}"); } else if (context == GUI_KEY_CONTEXT_MOUSE) { /* mouse events on chat area */ - BIND("@chat:button1-gesture-left", "/buffer -1"); - BIND("@chat:button1-gesture-right", "/buffer +1"); - BIND("@chat:button1-gesture-left-long", "/buffer 1"); - BIND("@chat:button1-gesture-right-long", "/input jump_last_buffer"); - BIND("@chat:wheelup", "/window scroll_up"); - BIND("@chat:wheeldown", "/window scroll_down"); + BIND("@chat:button1", "/window ${_window_number}"); + BIND("@chat:button1-gesture-left", "/window ${_window_number};/buffer -1"); + BIND("@chat:button1-gesture-right", "/window ${_window_number};/buffer +1"); + BIND("@chat:button1-gesture-left-long", "/window ${_window_number};/buffer 1"); + BIND("@chat:button1-gesture-right-long", "/window ${_window_number};/input jump_last_buffer"); + BIND("@chat:wheelup", "/window scroll_up -window ${_window_number}"); + BIND("@chat:wheeldown", "/window scroll_down -window ${_window_number}"); /* mouse events on nicklist */ - BIND("@bar(nicklist):button1-gesture-up", "/bar scroll nicklist * -100%"); - BIND("@bar(nicklist):button1-gesture-down", "/bar scroll nicklist * +100%"); - BIND("@bar(nicklist):button1-gesture-up-long", "/bar scroll nicklist * b"); - BIND("@bar(nicklist):button1-gesture-down-long", "/bar scroll nicklist * e"); - BIND("@item(buffer_nicklist):button1", "/query ${nick}"); - BIND("@item(buffer_nicklist):button2", "/whois ${nick}"); - BIND("@item(buffer_nicklist):button1-gesture-left", "/kick ${nick}"); - BIND("@item(buffer_nicklist):button1-gesture-left-long", "/kickban ${nick}"); - BIND("@item(buffer_nicklist):button2-gesture-left", "/ban ${nick}"); + BIND("@bar(nicklist):button1-gesture-up", "/bar scroll nicklist ${_window_number} -100%"); + BIND("@bar(nicklist):button1-gesture-down", "/bar scroll nicklist ${_window_number} +100%"); + BIND("@bar(nicklist):button1-gesture-up-long", "/bar scroll nicklist ${_window_number} b"); + BIND("@bar(nicklist):button1-gesture-down-long", "/bar scroll nicklist ${_window_number} e"); + BIND("@item(buffer_nicklist):button1", "/window ${_window_number};/query ${nick}"); + BIND("@item(buffer_nicklist):button2", "/window ${_window_number};/whois ${nick}"); + BIND("@item(buffer_nicklist):button1-gesture-left", "/window ${_window_number};/kick ${nick}"); + BIND("@item(buffer_nicklist):button1-gesture-left-long", "/window ${_window_number};/kickban ${nick}"); + BIND("@item(buffer_nicklist):button2-gesture-left", "/window ${_window_number};/ban ${nick}"); /* mouse wheel on any bar */ - BIND("@bar(*):wheelup", "/bar scroll ${_bar_name} * -10%"); - BIND("@bar(*):wheeldown", "/bar scroll ${_bar_name} * +10%"); + BIND("@bar(*):wheelup", "/bar scroll ${_bar_name} ${_window_number} -10%"); + BIND("@bar(*):wheeldown", "/bar scroll ${_bar_name} ${_window_number} +10%"); /* middle click to enable cursor mode at position */ BIND("@*:button3", "/cursor go ${_x},${_y}"); } diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c index 35d07a073..b3873f94b 100644 --- a/src/gui/gui-bar-item.c +++ b/src/gui/gui-bar-item.c @@ -62,7 +62,7 @@ char *gui_bar_item_names[GUI_BAR_NUM_ITEMS] = { "input_paste", "input_prompt", "input_search", "input_text", "time", "buffer_count", "buffer_plugin", "buffer_number", "buffer_name", "buffer_filter", "buffer_nicklist_count", "scroll", "hotlist", "completion", - "buffer_title", "buffer_nicklist" + "buffer_title", "buffer_nicklist", "window_number" }; char *gui_bar_items_default_for_bars[][2] = { { GUI_BAR_DEFAULT_NAME_INPUT, @@ -1422,6 +1422,28 @@ gui_bar_item_default_buffer_nicklist (void *data, struct t_gui_bar_item *item, } /* + * gui_bar_item_default_window_number: default item for number of window + */ + +char * +gui_bar_item_default_window_number (void *data, struct t_gui_bar_item *item, + struct t_gui_window *window) +{ + char buf[64]; + + /* make C compiler happy */ + (void) data; + (void) item; + + if (!window) + window = gui_current_window; + + snprintf (buf, sizeof (buf), "%d", window->number); + + return strdup (buf); +} + +/* * gui_bar_item_focus_buffer_nicklist: focus on nicklist */ @@ -1717,6 +1739,13 @@ gui_bar_item_init () gui_bar_item_names[GUI_BAR_ITEM_BUFFER_NICKLIST]); hook_focus (NULL, gui_bar_item_names[GUI_BAR_ITEM_BUFFER_NICKLIST], &gui_bar_item_focus_buffer_nicklist, NULL); + + /* window number */ + gui_bar_item_new (NULL, + gui_bar_item_names[GUI_BAR_ITEM_WINDOW_NUMBER], + &gui_bar_item_default_window_number, NULL); + gui_bar_item_hook_signal ("window_closed", + gui_bar_item_names[GUI_BAR_ITEM_WINDOW_NUMBER]); } /* diff --git a/src/gui/gui-bar-item.h b/src/gui/gui-bar-item.h index bcc7b134b..cb4c3c642 100644 --- a/src/gui/gui-bar-item.h +++ b/src/gui/gui-bar-item.h @@ -38,6 +38,7 @@ enum t_gui_bar_item_weechat GUI_BAR_ITEM_COMPLETION, GUI_BAR_ITEM_BUFFER_TITLE, GUI_BAR_ITEM_BUFFER_NICKLIST, + GUI_BAR_ITEM_WINDOW_NUMBER, /* number of bar items */ GUI_BAR_NUM_ITEMS, }; diff --git a/src/gui/gui-bar.c b/src/gui/gui-bar.c index 74da7e499..baf9a5502 100644 --- a/src/gui/gui-bar.c +++ b/src/gui/gui-bar.c @@ -2022,15 +2022,14 @@ gui_bar_update (const char *name) } /* - * gui_bar_scroll: scroll a bar for a buffer + * gui_bar_scroll: scroll a bar * return 1 if scroll is ok, 0 if error */ int -gui_bar_scroll (struct t_gui_bar *bar, struct t_gui_buffer *buffer, +gui_bar_scroll (struct t_gui_bar *bar, struct t_gui_window *window, const char *scroll) { - struct t_gui_window *ptr_win; struct t_gui_bar_window *ptr_bar_win; long number; char *str, *error; @@ -2118,22 +2117,16 @@ gui_bar_scroll (struct t_gui_bar *bar, struct t_gui_buffer *buffer, add_x, scroll_beginning, scroll_end, add, percent, number); } - else + else if (window) { - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + for (ptr_bar_win = window->bar_windows; ptr_bar_win; + ptr_bar_win = ptr_bar_win->next_bar_window) { - if (ptr_win->buffer == buffer) + if (ptr_bar_win->bar == bar) { - for (ptr_bar_win = ptr_win->bar_windows; ptr_bar_win; - ptr_bar_win = ptr_bar_win->next_bar_window) - { - if (ptr_bar_win->bar == bar) - { - gui_bar_window_scroll (ptr_bar_win, ptr_win, - add_x, scroll_beginning, scroll_end, - add, percent, number); - } - } + gui_bar_window_scroll (ptr_bar_win, window, + add_x, scroll_beginning, scroll_end, + add, percent, number); } } } diff --git a/src/gui/gui-bar.h b/src/gui/gui-bar.h index cb5e8b8d8..76e141b14 100644 --- a/src/gui/gui-bar.h +++ b/src/gui/gui-bar.h @@ -23,7 +23,6 @@ struct t_infolist; struct t_weechat_plugin; struct t_gui_window; -struct t_gui_buffer; #define GUI_BAR_DEFAULT_NAME_INPUT "input" #define GUI_BAR_DEFAULT_NAME_TITLE "title" @@ -151,7 +150,7 @@ extern void gui_bar_create_default_status (); extern void gui_bar_create_default_nicklist (); extern void gui_bar_create_default (); extern void gui_bar_update (const char *name); -extern int gui_bar_scroll (struct t_gui_bar *bar, struct t_gui_buffer *buffer, +extern int gui_bar_scroll (struct t_gui_bar *bar, struct t_gui_window *window, const char *scroll); extern void gui_bar_free (struct t_gui_bar *bar); extern void gui_bar_free_all (); diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h index 7f54005a5..eae31a665 100644 --- a/src/gui/gui-buffer.h +++ b/src/gui/gui-buffer.h @@ -79,7 +79,7 @@ struct t_gui_buffer */ struct t_gui_buffer *merge_for_upgrade; - int number; /* buffer number (for jump/switch) */ + int number; /* buffer number (first is 1) */ int layout_number; /* the number of buffer saved in */ /* layout */ int layout_applied; /* used when applying layout, to */ diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c index 34102870e..2f5b342cd 100644 --- a/src/gui/gui-window.c +++ b/src/gui/gui-window.c @@ -75,6 +75,25 @@ int gui_window_cursor_y = 0; /* cursor pos on screen */ /* + * gui_window_search_by_number: search a window by number + */ + +struct t_gui_window * +gui_window_search_by_number (int number) +{ + struct t_gui_window *ptr_win; + + for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + { + if (ptr_win->number == number) + return ptr_win; + } + + /* window not found */ + return NULL; +} + +/* * gui_window_search_by_xy: get pointer of window displayed at (x,y) * return NULL if no window is found */ @@ -432,6 +451,9 @@ gui_window_new (struct t_gui_window *parent_window, struct t_gui_buffer *buffer, return NULL; } + /* number */ + new_window->number = (last_gui_window) ? last_gui_window->number + 1 : 1; + /* position & size */ new_window->win_x = x; new_window->win_y = y; @@ -555,6 +577,8 @@ gui_window_get_integer (struct t_gui_window *window, const char *property) { if (window && property) { + if (string_strcasecmp (property, "number") == 0) + return window->number; if (string_strcasecmp (property, "win_x") == 0) return window->win_x; if (string_strcasecmp (property, "win_y") == 0) @@ -665,6 +689,11 @@ gui_window_set_layout_buffer_name (struct t_gui_window *window, void gui_window_free (struct t_gui_window *window) { + struct t_gui_window *ptr_win; + int i; + + hook_signal_send ("window_closing", WEECHAT_HOOK_SIGNAL_POINTER, window); + if (window->buffer) gui_buffer_add_value_num_displayed (window->buffer, -1); @@ -703,6 +732,15 @@ gui_window_free (struct t_gui_window *window) if (gui_current_window == window) gui_current_window = gui_windows; + i = 1; + for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + { + ptr_win->number = i; + i++; + } + + hook_signal_send ("window_closed", WEECHAT_HOOK_SIGNAL_POINTER, window); + free (window); } @@ -735,6 +773,23 @@ gui_window_switch_next (struct t_gui_window *window) } /* + * gui_window_switch_by_number: switch to window by number + */ + +void +gui_window_switch_by_number (int number) +{ + struct t_gui_window *ptr_win; + + if (!gui_ok) + return; + + ptr_win = gui_window_search_by_number (number); + if (ptr_win) + gui_window_switch (ptr_win); +} + +/* * gui_window_switch_by_buffer: switch to next window displaying a buffer */ @@ -1308,6 +1363,7 @@ gui_window_hdata_window_cb (void *data, const char *hdata_name) hdata = hdata_new (NULL, hdata_name, "prev_window", "next_window"); if (hdata) { + HDATA_VAR(struct t_gui_window, number, INTEGER, NULL); HDATA_VAR(struct t_gui_window, win_x, INTEGER, NULL); HDATA_VAR(struct t_gui_window, win_y, INTEGER, NULL); HDATA_VAR(struct t_gui_window, win_width, INTEGER, NULL); @@ -1413,6 +1469,8 @@ gui_window_add_to_infolist (struct t_infolist *infolist, if (!infolist_new_var_pointer (ptr_item, "pointer", window)) return 0; + if (!infolist_new_var_integer (ptr_item, "number", window->number)) + return 0; if (!infolist_new_var_integer (ptr_item, "x", window->win_x)) return 0; if (!infolist_new_var_integer (ptr_item, "y", window->win_y)) @@ -1466,6 +1524,7 @@ gui_window_print_log () { log_printf (""); log_printf ("[window (addr:0x%lx)]", ptr_window); + log_printf (" number. . . . . . . : %d", ptr_window->number); log_printf (" win_x . . . . . . . : %d", ptr_window->win_x); log_printf (" win_y . . . . . . . : %d", ptr_window->win_y); log_printf (" win_width . . . . . : %d", ptr_window->win_width); diff --git a/src/gui/gui-window.h b/src/gui/gui-window.h index 9bb76623a..54b405a9a 100644 --- a/src/gui/gui-window.h +++ b/src/gui/gui-window.h @@ -38,6 +38,8 @@ extern int gui_window_cursor_x, gui_window_cursor_y; struct t_gui_window { + int number; /* window number (first is 1) */ + /* global position & size */ int win_x, win_y; /* position of window */ int win_width, win_height; /* window geometry */ @@ -119,6 +121,7 @@ extern struct t_gui_window_tree *gui_windows_tree; /* window functions */ +extern struct t_gui_window *gui_window_search_by_number (int number); extern struct t_gui_window *gui_window_search_by_xy (int x, int y); extern void gui_window_ask_refresh (int refresh); extern int gui_window_tree_init (struct t_gui_window *window); @@ -148,6 +151,7 @@ extern void gui_window_set_layout_buffer_name (struct t_gui_window *window, extern void gui_window_free (struct t_gui_window *window); extern void gui_window_switch_previous (struct t_gui_window *window); extern void gui_window_switch_next (struct t_gui_window *window); +extern void gui_window_switch_by_number (int number); extern void gui_window_switch_by_buffer (struct t_gui_window *window, int buffer_number); extern void gui_window_scroll (struct t_gui_window *window, char *scroll); |