diff --git a/ChangeLog b/ChangeLog index 4f79228ce..bf25ff208 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.3.3-dev, 2010-07-05 +v0.3.3-dev, 2010-07-06 Version 0.3.3 (under dev!) @@ -19,6 +19,8 @@ Version 0.3.3 (under dev!) * core: add hashtables with new functions in plugin API * api: add function "string_expand_home", fix bug with replacement of home in paths +* irc: improve lag indicator: two colors (counting and finished), update item + even when pong has not been received, lag_min_show is now in milliseconds * irc: use empty real name by default in config, instead of reading real name in /etc/passwd (bug #30111) * irc: add new options irc.look.display_host_join/join_local/quit and diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index 76c837eae..066d6dc5c 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -13,6 +13,16 @@ ** Typ: Farbe ** Werte: ein Farbname (Standardwert: default) +* *irc.color.item_lag_counting* +** Beschreibung: color for lag indicator, when counting (pong not received from server, lag is increasing) +** Typ: Farbe +** Werte: ein Farbname (Standardwert: default) + +* *irc.color.item_lag_finished* +** Beschreibung: color for lag indicator, when pong has been received from server +** Typ: Farbe +** Werte: ein Farbname (Standardwert: yellow) + * *irc.color.message_join* ** Beschreibung: Textfarbe in der die Meldungen für das Betreten eines Channels angezeigt werden soll ** Typ: Farbe @@ -246,12 +256,12 @@ * *irc.network.away_check* ** Beschreibung: Überprüft die Abwesenheit (/away) der Nutzer, in dem angegebenen Intervall (in Minuten, 0 = nicht überprüfen) ** Typ: integer -** Werte: 0 .. 2147483647 (Standardwert: 0) +** Werte: 0 .. 10080 (Standardwert: 0) * *irc.network.away_check_max_nicks* ** Beschreibung: Die Abwesenheit von Nutzern in Channels wird nicht überprüft wenn die Anzahl der Nutzer höher ist, als der angegebene Wert (0 = unbegrenzte Anzahl an Nutzern im Channel) ** Typ: integer -** Werte: 0 .. 2147483647 (Standardwert: 25) +** Werte: 0 .. 1000000 (Standardwert: 25) * *irc.network.colors_receive* ** Beschreibung: Falls deaktiviert, werden Farben-Codes von eingehenden Nachrichten ignoriert. @@ -281,17 +291,22 @@ * *irc.network.lag_check* ** Beschreibung: Intervall zwischen zwei Lag-Überprüfungen (in Sekunden, 0 = keine Überprüfung) ** Typ: integer -** Werte: 0 .. 2147483647 (Standardwert: 60) +** Werte: 0 .. 604800 (Standardwert: 60) * *irc.network.lag_disconnect* ** Beschreibung: Maximal-Lag bis zum Trennen der Verbindung (in Minuten - 0 = niemals trennen) ** Typ: integer -** Werte: 0 .. 2147483647 (Standardwert: 0) +** Werte: 0 .. 10080 (Standardwert: 0) * *irc.network.lag_min_show* -** Beschreibung: Mindest-Lag, der angezeigt werden soll (in Sekunden) +** Beschreibung: minimum lag to show (in milliseconds) ** Typ: integer -** Werte: 0 .. 2147483647 (Standardwert: 1) +** Werte: 0 .. 86400000 (Standardwert: 500) + +* *irc.network.lag_refresh_interval* +** Beschreibung: interval between two refreshs of lag item, when lag is increasing (in seconds) +** Typ: integer +** Werte: 1 .. 3600 (Standardwert: 1) * *irc.network.send_unknown_commands* ** Beschreibung: Sende unbekannte Befehle an den Server diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 1bce57db0..5536a0b14 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -13,6 +13,16 @@ ** type: color ** values: a color name (default value: default) +* *irc.color.item_lag_counting* +** description: color for lag indicator, when counting (pong not received from server, lag is increasing) +** type: color +** values: a color name (default value: default) + +* *irc.color.item_lag_finished* +** description: color for lag indicator, when pong has been received from server +** type: color +** values: a color name (default value: yellow) + * *irc.color.message_join* ** description: color for text in join messages ** type: color @@ -246,12 +256,12 @@ * *irc.network.away_check* ** description: interval between two checks for away (in minutes, 0 = never check) ** type: integer -** values: 0 .. 2147483647 (default value: 0) +** values: 0 .. 10080 (default value: 0) * *irc.network.away_check_max_nicks* ** description: do not check away nicks on channels with high number of nicks (0 = unlimited) ** type: integer -** values: 0 .. 2147483647 (default value: 25) +** values: 0 .. 1000000 (default value: 25) * *irc.network.colors_receive* ** description: when off, colors codes are ignored in incoming messages @@ -281,17 +291,22 @@ * *irc.network.lag_check* ** description: interval between two checks for lag (in seconds, 0 = never check) ** type: integer -** values: 0 .. 2147483647 (default value: 60) +** values: 0 .. 604800 (default value: 60) * *irc.network.lag_disconnect* ** description: disconnect after important lag (in minutes, 0 = never disconnect) ** type: integer -** values: 0 .. 2147483647 (default value: 0) +** values: 0 .. 10080 (default value: 0) * *irc.network.lag_min_show* -** description: minimum lag to show (in seconds) +** description: minimum lag to show (in milliseconds) ** type: integer -** values: 0 .. 2147483647 (default value: 1) +** values: 0 .. 86400000 (default value: 500) + +* *irc.network.lag_refresh_interval* +** description: interval between two refreshs of lag item, when lag is increasing (in seconds) +** type: integer +** values: 1 .. 3600 (default value: 1) * *irc.network.send_unknown_commands* ** description: send unknown commands to server diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index 104cf8c1a..2537cef5d 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -13,6 +13,16 @@ ** type: couleur ** valeurs: un nom de couleur (valeur par défaut: default) +* *irc.color.item_lag_counting* +** description: couleur pour l'indicateur de lag, lorsque le décompte est en cours (pong non reçu du serveur, le lag augmente) +** type: couleur +** valeurs: un nom de couleur (valeur par défaut: default) + +* *irc.color.item_lag_finished* +** description: couleur pour l'indicateur de lag, lorsque le pong a été reçu du serveur +** type: couleur +** valeurs: un nom de couleur (valeur par défaut: yellow) + * *irc.color.message_join* ** description: couleur pour le texte dans les messages join ** type: couleur @@ -246,12 +256,12 @@ * *irc.network.away_check* ** description: intervalle entre deux vérifications des absences (en minutes, 0 = ne jamais vérifier) ** type: entier -** valeurs: 0 .. 2147483647 (valeur par défaut: 0) +** valeurs: 0 .. 10080 (valeur par défaut: 0) * *irc.network.away_check_max_nicks* ** description: ne pas vérifier les pseudos absents lorsqu'il y a un nombre important de pseudos (0 = pas de limite) ** type: entier -** valeurs: 0 .. 2147483647 (valeur par défaut: 25) +** valeurs: 0 .. 1000000 (valeur par défaut: 25) * *irc.network.colors_receive* ** description: si désactivé, les codes couleurs des messages entrants sont ignorés @@ -281,17 +291,22 @@ * *irc.network.lag_check* ** description: intervalle entre deux vérifications du lag (en secondes, 0 = ne jamais vérifier) ** type: entier -** valeurs: 0 .. 2147483647 (valeur par défaut: 60) +** valeurs: 0 .. 604800 (valeur par défaut: 60) * *irc.network.lag_disconnect* ** description: déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter) ** type: entier -** valeurs: 0 .. 2147483647 (valeur par défaut: 0) +** valeurs: 0 .. 10080 (valeur par défaut: 0) * *irc.network.lag_min_show* -** description: lag minimum à afficher (en secondes) +** description: lag minimum à afficher (en millisecondes) ** type: entier -** valeurs: 0 .. 2147483647 (valeur par défaut: 1) +** valeurs: 0 .. 86400000 (valeur par défaut: 500) + +* *irc.network.lag_refresh_interval* +** description: intervalle entre deux rafraichissements du lag, lorsque le lag augmente (en secondes) +** type: entier +** valeurs: 1 .. 3600 (valeur par défaut: 1) * *irc.network.send_unknown_commands* ** description: envoie les commandes inconnues au serveur diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index 69fc64252..929177b2a 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -13,6 +13,16 @@ ** tipo: colore ** valori: un nome colore (valore predefinito: default) +* *irc.color.item_lag_counting* +** descrizione: color for lag indicator, when counting (pong not received from server, lag is increasing) +** tipo: colore +** valori: un nome colore (valore predefinito: default) + +* *irc.color.item_lag_finished* +** descrizione: color for lag indicator, when pong has been received from server +** tipo: colore +** valori: un nome colore (valore predefinito: yellow) + * *irc.color.message_join* ** descrizione: colore per il testo nei messaggi di entrata ** tipo: colore @@ -246,12 +256,12 @@ * *irc.network.away_check* ** descrizione: intervallo tra le due verifiche per l'assenza (in minuti, 0 = nessun check) ** tipo: intero -** valori: 0 .. 2147483647 (valore predefinito: 0) +** valori: 0 .. 10080 (valore predefinito: 0) * *irc.network.away_check_max_nicks* ** descrizione: non verificare l'assenza su canali con un elevato numero di nick (0 = illimitato) ** tipo: intero -** valori: 0 .. 2147483647 (valore predefinito: 25) +** valori: 0 .. 1000000 (valore predefinito: 25) * *irc.network.colors_receive* ** descrizione: se disabilitato, i codici colori vengono ignorati nei messaggi in entrata @@ -281,17 +291,22 @@ * *irc.network.lag_check* ** descrizione: intervallo tra due controlli per il ritardo (in secondi, 0 = nessun controllo) ** tipo: intero -** valori: 0 .. 2147483647 (valore predefinito: 60) +** valori: 0 .. 604800 (valore predefinito: 60) * *irc.network.lag_disconnect* ** descrizione: disconnetti dopo un ritardo eccessivo (in minuti, 0 = nessuna disconnessione) ** tipo: intero -** valori: 0 .. 2147483647 (valore predefinito: 0) +** valori: 0 .. 10080 (valore predefinito: 0) * *irc.network.lag_min_show* -** descrizione: ritardo minimo da visualizzare (in secondi) +** descrizione: minimum lag to show (in milliseconds) ** tipo: intero -** valori: 0 .. 2147483647 (valore predefinito: 1) +** valori: 0 .. 86400000 (valore predefinito: 500) + +* *irc.network.lag_refresh_interval* +** descrizione: interval between two refreshs of lag item, when lag is increasing (in seconds) +** tipo: intero +** valori: 1 .. 3600 (valore predefinito: 1) * *irc.network.send_unknown_commands* ** descrizione: invia comandi sconosciuti al server diff --git a/po/cs.po b/po/cs.po index eaf4b57ff..2a82a6846 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-22 19:24+0200\n" +"POT-Creation-Date: 2010-07-06 11:58+0200\n" "PO-Revision-Date: 2010-06-20 21:24+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -4571,6 +4571,14 @@ msgstr "barva položek, které jsou pryč" msgid "color for channel modes, near channel name" msgstr "barva módů kanálu, blízko jména kanálu" +msgid "" +"color for lag indicator, when counting (pong not received from server, lag " +"is increasing)" +msgstr "" + +msgid "color for lag indicator, when pong has been received from server" +msgstr "" + #, fuzzy msgid "color for reason in part/quit messages" msgstr "barva textu ve zprávách odchodu/ukončení" @@ -4621,12 +4629,20 @@ msgid "interval between two checks for lag (in seconds, 0 = never check)" msgstr "" "interval mezi dvěmi knotrolami pro lag (v sekundách, 0 = nikdy nekontrolovat)" -msgid "minimum lag to show (in seconds)" +#, fuzzy +msgid "minimum lag to show (in milliseconds)" msgstr "minimální lag, který zobrazit (v sekundách)" msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "odpojit po závažném lagu (v minutách, 0 = nikny neodpojit)" +#, fuzzy +msgid "" +"interval between two refreshs of lag item, when lag is increasing (in " +"seconds)" +msgstr "" +"interval mezi dvěmi knotrolami pro lag (v sekundách, 0 = nikdy nekontrolovat)" + msgid "" "anti-flood for high priority queue: number of seconds between two user " "messages or commands sent to IRC server (0 = no anti-flood)" diff --git a/po/de.po b/po/de.po index b57b1f9f2..42f0edb59 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-22 19:24+0200\n" +"POT-Creation-Date: 2010-07-06 11:58+0200\n" "PO-Revision-Date: 2010-06-20 21:24+0200\n" "Last-Translator: Nils G.\n" "Language-Team: weechat-dev \n" @@ -4754,6 +4754,14 @@ msgstr "Farbe des Abwesenheit-Textes in der Eingabezeile" msgid "color for channel modes, near channel name" msgstr "Farbe der Channel-Modes (neben dem Channelnamen)" +msgid "" +"color for lag indicator, when counting (pong not received from server, lag " +"is increasing)" +msgstr "" + +msgid "color for lag indicator, when pong has been received from server" +msgstr "" + msgid "color for reason in part/quit messages" msgstr "" "Textfarbe in der die Begründung einer part/quit Nachricht angezeigt werden " @@ -4813,13 +4821,22 @@ msgstr "" "Intervall zwischen zwei Lag-Überprüfungen (in Sekunden, 0 = keine " "Überprüfung)" -msgid "minimum lag to show (in seconds)" +#, fuzzy +msgid "minimum lag to show (in milliseconds)" msgstr "Mindest-Lag, der angezeigt werden soll (in Sekunden)" msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "" "Maximal-Lag bis zum Trennen der Verbindung (in Minuten - 0 = niemals trennen)" +#, fuzzy +msgid "" +"interval between two refreshs of lag item, when lag is increasing (in " +"seconds)" +msgstr "" +"Intervall zwischen zwei Lag-Überprüfungen (in Sekunden, 0 = keine " +"Überprüfung)" + msgid "" "anti-flood for high priority queue: number of seconds between two user " "messages or commands sent to IRC server (0 = no anti-flood)" diff --git a/po/es.po b/po/es.po index d3e3f9775..8d951e7b5 100644 --- a/po/es.po +++ b/po/es.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-22 19:24+0200\n" +"POT-Creation-Date: 2010-07-06 11:58+0200\n" "PO-Revision-Date: 2010-06-20 21:24+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -4637,6 +4637,14 @@ msgstr "color para el texto \"ausente\" en al barra de entrada" msgid "color for channel modes, near channel name" msgstr "color para los modos del canal, junto al nombre del canal" +msgid "" +"color for lag indicator, when counting (pong not received from server, lag " +"is increasing)" +msgstr "" + +msgid "color for lag indicator, when pong has been received from server" +msgstr "" + #, fuzzy msgid "color for reason in part/quit messages" msgstr "color para el texto en mensajes de salida/abandono" @@ -4687,13 +4695,22 @@ msgstr "" "intervalo entre dos comprobaciones de retraso (en segundos, 0 = nunca " "comprobar)" -msgid "minimum lag to show (in seconds)" +#, fuzzy +msgid "minimum lag to show (in milliseconds)" msgstr "retraso mínimo a mostrar (en segundos)" msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "" "desconexión tras un retraso importante (en minutos, 0 = no desconectar nunca)" +#, fuzzy +msgid "" +"interval between two refreshs of lag item, when lag is increasing (in " +"seconds)" +msgstr "" +"intervalo entre dos comprobaciones de retraso (en segundos, 0 = nunca " +"comprobar)" + msgid "" "anti-flood for high priority queue: number of seconds between two user " "messages or commands sent to IRC server (0 = no anti-flood)" diff --git a/po/fr.po b/po/fr.po index 8141505dc..63ff6491b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-22 19:24+0200\n" -"PO-Revision-Date: 2010-06-20 21:34+0200\n" +"POT-Creation-Date: 2010-07-06 11:58+0200\n" +"PO-Revision-Date: 2010-07-06 11:58+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -4680,6 +4680,17 @@ msgstr "couleur pour l'objet away" msgid "color for channel modes, near channel name" msgstr "couleur pour les modes du canal, à côté du nom du canal" +msgid "" +"color for lag indicator, when counting (pong not received from server, lag " +"is increasing)" +msgstr "" +"couleur pour l'indicateur de lag, lorsque le décompte est en cours (pong non " +"reçu du serveur, le lag augmente)" + +msgid "color for lag indicator, when pong has been received from server" +msgstr "" +"couleur pour l'indicateur de lag, lorsque le pong a été reçu du serveur" + msgid "color for reason in part/quit messages" msgstr "couleur pour la raison dans les messages part/quit" @@ -4733,13 +4744,20 @@ msgstr "" "intervalle entre deux vérifications du lag (en secondes, 0 = ne jamais " "vérifier)" -msgid "minimum lag to show (in seconds)" -msgstr "lag minimum à afficher (en secondes)" +msgid "minimum lag to show (in milliseconds)" +msgstr "lag minimum à afficher (en millisecondes)" msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "" "déconnexion après un lag important (en minutes, 0 = ne jamais se déconnecter)" +msgid "" +"interval between two refreshs of lag item, when lag is increasing (in " +"seconds)" +msgstr "" +"intervalle entre deux rafraichissements du lag, lorsque le lag augmente (en " +"secondes)" + msgid "" "anti-flood for high priority queue: number of seconds between two user " "messages or commands sent to IRC server (0 = no anti-flood)" diff --git a/po/hu.po b/po/hu.po index 22749886c..277b9efc0 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-22 19:24+0200\n" +"POT-Creation-Date: 2010-07-06 11:58+0200\n" "PO-Revision-Date: 2010-06-20 21:24+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4376,6 +4376,14 @@ msgstr "távollevő felhasználók nevének színe" msgid "color for channel modes, near channel name" msgstr "szobanevek színe az eseményekben" +msgid "" +"color for lag indicator, when counting (pong not received from server, lag " +"is increasing)" +msgstr "" + +msgid "color for lag indicator, when pong has been received from server" +msgstr "" + #, fuzzy msgid "color for reason in part/quit messages" msgstr "alapértelmezett kilépő üzenet" @@ -4422,12 +4430,19 @@ msgstr "" msgid "interval between two checks for lag (in seconds, 0 = never check)" msgstr "két távollétellenőrzés közti idő (percben, 0 = nincs ellenőrzés)" -msgid "minimum lag to show (in seconds)" +#, fuzzy +msgid "minimum lag to show (in milliseconds)" msgstr "minimális kijelzett késés (másodpercben)" msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "lekapcsolódás túl nagy késés esetén (percben, 0 = nincs lecsatlakozás)" +#, fuzzy +msgid "" +"interval between two refreshs of lag item, when lag is increasing (in " +"seconds)" +msgstr "két távollétellenőrzés közti idő (percben, 0 = nincs ellenőrzés)" + #, fuzzy msgid "" "anti-flood for high priority queue: number of seconds between two user " diff --git a/po/it.po b/po/it.po index 1cbf2972e..1ce902de6 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: Weechat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-22 19:24+0200\n" +"POT-Creation-Date: 2010-07-06 11:58+0200\n" "PO-Revision-Date: 2010-06-20 21:24+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -4650,6 +4650,14 @@ msgstr "colore per l'elemento assenza" msgid "color for channel modes, near channel name" msgstr "colore per le modalità dei canali, vicino ai nomi dei canali" +msgid "" +"color for lag indicator, when counting (pong not received from server, lag " +"is increasing)" +msgstr "" + +msgid "color for lag indicator, when pong has been received from server" +msgstr "" + msgid "color for reason in part/quit messages" msgstr "colore per il motivo nei messaggi di uscita/abbandono" @@ -4703,13 +4711,22 @@ msgstr "" "intervallo tra due controlli per il ritardo (in secondi, 0 = nessun " "controllo)" -msgid "minimum lag to show (in seconds)" +#, fuzzy +msgid "minimum lag to show (in milliseconds)" msgstr "ritardo minimo da visualizzare (in secondi)" msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "" "disconnetti dopo un ritardo eccessivo (in minuti, 0 = nessuna disconnessione)" +#, fuzzy +msgid "" +"interval between two refreshs of lag item, when lag is increasing (in " +"seconds)" +msgstr "" +"intervallo tra due controlli per il ritardo (in secondi, 0 = nessun " +"controllo)" + msgid "" "anti-flood for high priority queue: number of seconds between two user " "messages or commands sent to IRC server (0 = no anti-flood)" diff --git a/po/pl.po b/po/pl.po index 8875acc73..3d773fe88 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-22 19:24+0200\n" +"POT-Creation-Date: 2010-07-06 11:58+0200\n" "PO-Revision-Date: 2010-06-20 21:25+0200\n" "Last-Translator: B.J. Stobiecki \n" "Language-Team: weechat-dev \n" @@ -4614,6 +4614,14 @@ msgstr "kolor elementu nieobecności" msgid "color for channel modes, near channel name" msgstr "kolor trybów kanału, przy nazwie kanału" +msgid "" +"color for lag indicator, when counting (pong not received from server, lag " +"is increasing)" +msgstr "" + +msgid "color for lag indicator, when pong has been received from server" +msgstr "" + #, fuzzy msgid "color for reason in part/quit messages" msgstr "kolor tekstu w wiadomościach o opuszczeniu kanału/wyjściu z IRC" @@ -4665,12 +4673,21 @@ msgstr "" "przerwa między dwoma sprawdzeniami opóźnienia (w sekundach, 0 = nigdy nie " "sprawdzaj)" -msgid "minimum lag to show (in seconds)" +#, fuzzy +msgid "minimum lag to show (in milliseconds)" msgstr "minimalne opóźnienie do pokazania (w sekundach)" msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "rozłącz po dużym opóźnieniu (w minutach, 0 = nie rozłączaj nigdy)" +#, fuzzy +msgid "" +"interval between two refreshs of lag item, when lag is increasing (in " +"seconds)" +msgstr "" +"przerwa między dwoma sprawdzeniami opóźnienia (w sekundach, 0 = nigdy nie " +"sprawdzaj)" + msgid "" "anti-flood for high priority queue: number of seconds between two user " "messages or commands sent to IRC server (0 = no anti-flood)" diff --git a/po/ru.po b/po/ru.po index 28a6a8e4f..a938b3934 100644 --- a/po/ru.po +++ b/po/ru.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-22 19:24+0200\n" +"POT-Creation-Date: 2010-07-06 11:58+0200\n" "PO-Revision-Date: 2010-06-20 21:25+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -4382,6 +4382,14 @@ msgstr "цвет отошедших ников" msgid "color for channel modes, near channel name" msgstr "цвет имён при действиях" +msgid "" +"color for lag indicator, when counting (pong not received from server, lag " +"is increasing)" +msgstr "" + +msgid "color for lag indicator, when pong has been received from server" +msgstr "" + #, fuzzy msgid "color for reason in part/quit messages" msgstr "сообщение о выходе по-умолчанию" @@ -4427,13 +4435,21 @@ msgid "interval between two checks for lag (in seconds, 0 = never check)" msgstr "" "интервал между проверками на отсутствие (в минутах, 0 = не проверять никогда)" -msgid "minimum lag to show (in seconds)" +#, fuzzy +msgid "minimum lag to show (in milliseconds)" msgstr "минимальная отображаемая задержка (в секундах)" msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "" "отключаться при серьёзной задержке (в минутах, 0 = не отключаться никогда)" +#, fuzzy +msgid "" +"interval between two refreshs of lag item, when lag is increasing (in " +"seconds)" +msgstr "" +"интервал между проверками на отсутствие (в минутах, 0 = не проверять никогда)" + #, fuzzy msgid "" "anti-flood for high priority queue: number of seconds between two user " diff --git a/po/weechat.pot b/po/weechat.pot index 9c99f2fc7..8b7a4f146 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: 2010-06-22 19:24+0200\n" +"POT-Creation-Date: 2010-07-06 11:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3741,6 +3741,14 @@ msgstr "" msgid "color for channel modes, near channel name" msgstr "" +msgid "" +"color for lag indicator, when counting (pong not received from server, lag " +"is increasing)" +msgstr "" + +msgid "color for lag indicator, when pong has been received from server" +msgstr "" + msgid "color for reason in part/quit messages" msgstr "" @@ -3778,12 +3786,17 @@ msgstr "" msgid "interval between two checks for lag (in seconds, 0 = never check)" msgstr "" -msgid "minimum lag to show (in seconds)" +msgid "minimum lag to show (in milliseconds)" msgstr "" msgid "disconnect after important lag (in minutes, 0 = never disconnect)" msgstr "" +msgid "" +"interval between two refreshs of lag item, when lag is increasing (in " +"seconds)" +msgstr "" + msgid "" "anti-flood for high priority queue: number of seconds between two user " "messages or commands sent to IRC server (0 = no anti-flood)" diff --git a/src/plugins/irc/irc-bar-item.c b/src/plugins/irc/irc-bar-item.c index 558ba5a29..78a890822 100644 --- a/src/plugins/irc/irc-bar-item.c +++ b/src/plugins/irc/irc-bar-item.c @@ -365,7 +365,7 @@ char * irc_bar_item_lag (void *data, struct t_gui_bar_item *item, struct t_gui_window *window) { - char buf[32]; + char buf[128]; struct t_gui_buffer *buffer; struct t_irc_server *server; @@ -380,11 +380,14 @@ irc_bar_item_lag (void *data, struct t_gui_bar_item *item, irc_buffer_get_server_and_channel (buffer, &server, NULL); if (server - && (server->lag >= weechat_config_integer (irc_config_network_lag_min_show) * 1000)) + && (server->lag >= weechat_config_integer (irc_config_network_lag_min_show))) { snprintf (buf, sizeof (buf), - "%s: %.1f", + ((server->lag_check_time.tv_sec == 0) || (server->lag < 1000)) ? + "%s: %s%.3f" : "%s: %s%.0f", _("Lag"), + (server->lag_check_time.tv_sec == 0) ? + IRC_COLOR_ITEM_LAG_FINISHED : IRC_COLOR_ITEM_LAG_COUNTING, ((float)(server->lag)) / 1000); return strdup (buf); } diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h index df795ac65..0031a97e0 100644 --- a/src/plugins/irc/irc-color.h +++ b/src/plugins/irc/irc-color.h @@ -83,6 +83,8 @@ #define IRC_COLOR_INPUT_NICK weechat_color(weechat_config_string(irc_config_color_input_nick)) #define IRC_COLOR_ITEM_AWAY weechat_color(weechat_config_string(irc_config_color_item_away)) #define IRC_COLOR_ITEM_CHANNEL_MODES weechat_color(weechat_config_string(irc_config_color_item_channel_modes)) +#define IRC_COLOR_ITEM_LAG_COUNTING weechat_color(weechat_config_string(irc_config_color_item_lag_counting)) +#define IRC_COLOR_ITEM_LAG_FINISHED weechat_color(weechat_config_string(irc_config_color_item_lag_finished)) #define IRC_COLOR_NICK_IN_SERVER_MESSAGE(nick) \ ((nick && weechat_config_boolean(irc_config_look_color_nicks_in_server_messages)) ? \ nick->color : IRC_COLOR_CHAT_NICK) diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 406da4e5e..6d2e4e7f3 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -96,6 +96,8 @@ struct t_config_option *irc_config_color_notice; struct t_config_option *irc_config_color_input_nick; struct t_config_option *irc_config_color_item_away; struct t_config_option *irc_config_color_item_channel_modes; +struct t_config_option *irc_config_color_item_lag_counting; +struct t_config_option *irc_config_color_item_lag_finished; struct t_config_option *irc_config_color_reason_quit; /* IRC config, network section */ @@ -110,6 +112,7 @@ struct t_config_option *irc_config_network_away_check_max_nicks; struct t_config_option *irc_config_network_lag_check; struct t_config_option *irc_config_network_lag_min_show; struct t_config_option *irc_config_network_lag_disconnect; +struct t_config_option *irc_config_network_lag_refresh_interval; struct t_config_option *irc_config_network_anti_flood[2]; struct t_config_option *irc_config_network_colors_receive; struct t_config_option *irc_config_network_colors_send; @@ -416,6 +419,22 @@ irc_config_change_color_item_buffer_name (void *data, weechat_bar_item_update ("buffer_name"); } +/* + * irc_config_change_color_item_lag: called when the color of lag item is + * changed + */ + +void +irc_config_change_color_item_lag (void *data, + struct t_config_option *option) +{ + /* make C compiler happy */ + (void) data; + (void) option; + + weechat_bar_item_update ("lag"); +} + /* * irc_config_change_color_nick_prefix: called when the color of a nick prefix * is changed @@ -490,6 +509,21 @@ irc_config_change_network_lag_check (void *data, } } +/* + * irc_config_change_network_lag_min_show: called when lag min show is changed + */ + +void +irc_config_change_network_lag_min_show (void *data, + struct t_config_option *option) +{ + /* make C compiler happy */ + (void) data; + (void) option; + + weechat_bar_item_update ("lag"); +} + /* * irc_config_change_network_send_unknown_commands: called when "send_unknown_commands" * is changed @@ -1725,6 +1759,19 @@ irc_config_init () N_("color for channel modes, near channel name"), NULL, -1, 0, "default", NULL, 0, NULL, NULL, &irc_config_change_color_item_buffer_name, NULL, NULL, NULL); + irc_config_color_item_lag_counting = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_lag_counting", "color", + N_("color for lag indicator, when counting (pong not received from " + "server, lag is increasing)"), + NULL, -1, 0, "default", NULL, 0, NULL, NULL, + &irc_config_change_color_item_lag, NULL, NULL, NULL); + irc_config_color_item_lag_finished = weechat_config_new_option ( + irc_config_file, ptr_section, + "item_lag_finished", "color", + N_("color for lag indicator, when pong has been received from server"), + NULL, -1, 0, "yellow", NULL, 0, NULL, NULL, + &irc_config_change_color_item_lag, NULL, NULL, NULL); irc_config_color_reason_quit = weechat_config_new_option ( irc_config_file, ptr_section, "reason_quit", "color", @@ -1782,33 +1829,40 @@ irc_config_init () "away_check", "integer", N_("interval between two checks for away (in minutes, 0 = never " "check)"), - NULL, 0, INT_MAX, "0", NULL, 0, NULL, NULL, + NULL, 0, 60 * 24 * 7, "0", NULL, 0, NULL, NULL, &irc_config_change_network_away_check, NULL, NULL, NULL); irc_config_network_away_check_max_nicks = weechat_config_new_option ( irc_config_file, ptr_section, "away_check_max_nicks", "integer", N_("do not check away nicks on channels with high number of nicks " "(0 = unlimited)"), - NULL, 0, INT_MAX, "25", NULL, 0, NULL, NULL, + NULL, 0, 1000000, "25", NULL, 0, NULL, NULL, &irc_config_change_network_away_check, NULL, NULL, NULL); irc_config_network_lag_check = weechat_config_new_option ( irc_config_file, ptr_section, "lag_check", "integer", N_("interval between two checks for lag (in seconds, 0 = never " "check)"), - NULL, 0, INT_MAX, "60", NULL, 0, NULL, NULL, + NULL, 0, 3600 * 24 * 7, "60", NULL, 0, NULL, NULL, &irc_config_change_network_lag_check, NULL, NULL, NULL); irc_config_network_lag_min_show = weechat_config_new_option ( irc_config_file, ptr_section, "lag_min_show", "integer", - N_("minimum lag to show (in seconds)"), - NULL, 0, INT_MAX, "1", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + N_("minimum lag to show (in milliseconds)"), + NULL, 0, 1000 * 3600 * 24, "500", NULL, 0, NULL, NULL, + &irc_config_change_network_lag_min_show, NULL, NULL, NULL); irc_config_network_lag_disconnect = weechat_config_new_option ( irc_config_file, ptr_section, "lag_disconnect", "integer", N_("disconnect after important lag (in minutes, 0 = never " "disconnect)"), - NULL, 0, INT_MAX, "0", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + NULL, 0, 60 * 24 * 7, "0", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_network_lag_refresh_interval = weechat_config_new_option ( + irc_config_file, ptr_section, + "lag_refresh_interval", "integer", + N_("interval between two refreshs of lag item, when lag is increasing " + "(in seconds)"), + NULL, 1, 3600, "1", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_network_anti_flood[0] = weechat_config_new_option ( irc_config_file, ptr_section, "anti_flood_prio_high", "integer", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index e2a5f79ca..ea425405b 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -113,6 +113,8 @@ extern struct t_config_option *irc_config_color_notice; extern struct t_config_option *irc_config_color_input_nick; extern struct t_config_option *irc_config_color_item_away; extern struct t_config_option *irc_config_color_item_channel_modes; +extern struct t_config_option *irc_config_color_item_lag_counting; +extern struct t_config_option *irc_config_color_item_lag_finished; extern struct t_config_option *irc_config_color_reason_quit; extern struct t_config_option *irc_config_network_autoreconnect_delay_growing; @@ -125,6 +127,7 @@ extern struct t_config_option *irc_config_network_away_check_max_nicks; extern struct t_config_option *irc_config_network_lag_check; extern struct t_config_option *irc_config_network_lag_min_show; extern struct t_config_option *irc_config_network_lag_disconnect; +extern struct t_config_option *irc_config_network_lag_refresh_interval; extern struct t_config_option *irc_config_network_anti_flood[2]; extern struct t_config_option *irc_config_network_colors_receive; extern struct t_config_option *irc_config_network_colors_send; diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 795a41441..26b7ac14f 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -422,6 +422,7 @@ irc_server_alloc (const char *name) new_server->lag_check_time.tv_usec = 0; new_server->lag_next_check = time (NULL) + weechat_config_integer (irc_config_network_lag_check); + new_server->lag_last_refresh = 0; new_server->cmd_list_regexp = NULL; new_server->last_user_message = 0; for (i = 0; i < IRC_SERVER_NUM_OUTQUEUES_PRIO; i++) @@ -1937,7 +1938,6 @@ irc_server_timer_cb (void *data, int remaining_calls) struct t_irc_server *ptr_server; time_t new_time; static struct timeval tv; - int diff; /* make C compiler happy */ (void) data; @@ -1970,6 +1970,8 @@ irc_server_timer_cb (void *data, int remaining_calls) irc_server_sendf (ptr_server, 0, "PING %s", ptr_server->addresses_array[ptr_server->index_current_address]); gettimeofday (&(ptr_server->lag_check_time), NULL); + ptr_server->lag = 0; + ptr_server->lag_last_refresh = 0; } /* check if it's time to autojoin channels (after command delay) */ @@ -1981,14 +1983,23 @@ irc_server_timer_cb (void *data, int remaining_calls) ptr_server->command_time = 0; } - /* lag timeout => disconnect */ - if ((ptr_server->lag_check_time.tv_sec != 0) - && (weechat_config_integer (irc_config_network_lag_disconnect) > 0)) + /* compute lag */ + if (ptr_server->lag_check_time.tv_sec != 0) { gettimeofday (&tv, NULL); - diff = (int) weechat_util_timeval_diff (&(ptr_server->lag_check_time), - &tv); - if (diff / 1000 > weechat_config_integer (irc_config_network_lag_disconnect) * 60) + ptr_server->lag = (int) weechat_util_timeval_diff (&(ptr_server->lag_check_time), + &tv); + /* refresh lag item if needed */ + if (((ptr_server->lag_last_refresh == 0) + || (new_time >= ptr_server->lag_last_refresh + weechat_config_integer (irc_config_network_lag_refresh_interval))) + && (ptr_server->lag >= weechat_config_integer (irc_config_network_lag_min_show))) + { + ptr_server->lag_last_refresh = new_time; + weechat_bar_item_update ("lag"); + } + /* lag timeout? => disconnect */ + if ((weechat_config_integer (irc_config_network_lag_disconnect) > 0) + && (ptr_server->lag / 1000 > weechat_config_integer (irc_config_network_lag_disconnect) * 60)) { weechat_printf (ptr_server->buffer, _("%s: lag is high, disconnecting " @@ -3074,6 +3085,7 @@ irc_server_disconnect (struct t_irc_server *server, int reconnect) server->lag_check_time.tv_usec = 0; server->lag_next_check = time (NULL) + weechat_config_integer (irc_config_network_lag_check); + server->lag_last_refresh = 0; if (reconnect && IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_AUTORECONNECT)) @@ -3676,6 +3688,8 @@ irc_server_add_to_infolist (struct t_infolist *infolist, return 0; if (!weechat_infolist_new_var_time (ptr_item, "lag_next_check", server->lag_next_check)) return 0; + if (!weechat_infolist_new_var_time (ptr_item, "lag_last_refresh", server->lag_last_refresh)) + return 0; if (!weechat_infolist_new_var_time (ptr_item, "last_user_message", server->last_user_message)) return 0; @@ -3905,6 +3919,7 @@ irc_server_print_log () ptr_server->lag_check_time.tv_sec, ptr_server->lag_check_time.tv_usec); weechat_log_printf (" lag_next_check . . . : %ld", ptr_server->lag_next_check); + weechat_log_printf (" lag_last_refresh . . : %ld", ptr_server->lag_last_refresh); weechat_log_printf (" cmd_list_regexp. . . : 0x%lx", ptr_server->cmd_list_regexp); weechat_log_printf (" last_user_message. . : %ld", ptr_server->last_user_message); for (i = 0; i < IRC_SERVER_NUM_OUTQUEUES_PRIO; i++) diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h index 997f055b4..8ca2615f8 100644 --- a/src/plugins/irc/irc-server.h +++ b/src/plugins/irc/irc-server.h @@ -149,6 +149,7 @@ struct t_irc_server int lag; /* lag (in milliseconds) */ struct timeval lag_check_time; /* last time lag was checked (ping sent) */ time_t lag_next_check; /* time for next check */ + time_t lag_last_refresh; /* last refresh of lag item */ regex_t *cmd_list_regexp; /* compiled Regular Expression for /list */ time_t last_user_message; /* time of last user message (anti flood)*/ struct t_irc_outqueue *outqueue[2]; /* queue for outgoing messages */ diff --git a/src/plugins/irc/irc-upgrade.c b/src/plugins/irc/irc-upgrade.c index 1ef0a69c7..ad7ab38b7 100644 --- a/src/plugins/irc/irc-upgrade.c +++ b/src/plugins/irc/irc-upgrade.c @@ -274,6 +274,7 @@ irc_upgrade_read_cb (void *data, if (buf) memcpy (&(irc_upgrade_current_server->lag_check_time), buf, size); irc_upgrade_current_server->lag_next_check = weechat_infolist_time (infolist, "lag_next_check"); + irc_upgrade_current_server->lag_last_refresh = weechat_infolist_time (infolist, "lag_last_refresh"); irc_upgrade_current_server->last_user_message = weechat_infolist_time (infolist, "last_user_message"); } break;