diff --git a/ChangeLog b/ChangeLog index f23c60e7b..17b60a71f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,8 @@ ChangeLog - 2004-07-03 Version 0.0.7 (under dev!): - * windows management improved: buffers ordered by number, split terminal - horizontally/vertically + * buffers ordered by number, auto-switch to active buffers (alt-a) + * split terminal horizontally/vertically * unique color for each nick (based on nickname) * action messages are now considered as messages, not crappy joins/parts * fixed display bug when nicklist is displayed at bottom of screen diff --git a/TODO b/TODO index 65f0628e4..a33d7f85d 100644 --- a/TODO +++ b/TODO @@ -22,7 +22,7 @@ v0.0.7: * Interface: + split terminal in multiple windows (horizontally/vertically) - + hotlist (channels with activity) and auto-jump to channels + + hotlist (channels with activity) and auto-switch to channels + internationalization (traduce WeeChat in many languages) * Configuration: diff --git a/po/fr.po b/po/fr.po index 9d728f7d6..1fe44807a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.0.7-pre2\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-06-27 15:36+0200\n" +"POT-Creation-Date: 2004-07-03 15:08+0200\n" "PO-Revision-Date: 2004-06-05 10:52+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/irc/irc-nick.c:186 +#: src/irc/irc-nick.c:170 #, c-format msgid "%s cannot allocate new nick\n" msgstr "%s ompossible d'allouer un nouveau pseudo\n" @@ -1137,7 +1137,7 @@ msgstr "drapeau de mode inconnu" msgid "can't change mode for other users" msgstr "impossible de changer le mode pour les autres utilisateurs" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2862 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2865 msgid "unknown" msgstr "inconnu" @@ -1162,12 +1162,12 @@ msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n" #: src/irc/irc-send.c:481 src/irc/irc-send.c:503 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:990 +#: src/irc/irc-recv.c:993 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n" -#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1151 +#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1154 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s impossible de créer la fenêtre privée \"%s\"\n" @@ -1192,7 +1192,7 @@ msgid " has joined " msgstr " a rejoint " #: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:999 src/irc/irc-recv.c:2362 src/irc/irc-recv.c:2427 +#: src/irc/irc-recv.c:1002 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2430 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "%s canal non trouvé pour la commande \"%s\"\n" @@ -1294,7 +1294,7 @@ msgid "removes voice from" msgstr "supprime la voix de" #: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1216 +#: src/irc/irc-recv.c:1219 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s commande \"%s\" reçue sans host\n" @@ -1339,216 +1339,216 @@ msgstr "%s commande \"%s\" re msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:953 +#: src/irc/irc-recv.c:955 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:976 +#: src/irc/irc-recv.c:979 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:1044 +#: src/irc/irc-recv.c:1047 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:1046 +#: src/irc/irc-recv.c:1049 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:1048 +#: src/irc/irc-recv.c:1051 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:1083 src/irc/irc-recv.c:1097 src/irc/irc-recv.c:1112 -#: src/irc/irc-recv.c:1127 src/irc/irc-recv.c:1193 src/irc/irc-recv.c:2648 -#: src/irc/irc-recv.c:2688 +#: src/irc/irc-recv.c:1086 src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1115 +#: src/irc/irc-recv.c:1130 src/irc/irc-recv.c:1196 src/irc/irc-recv.c:2651 +#: src/irc/irc-recv.c:2691 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1175 +#: src/irc/irc-recv.c:1178 #, c-format msgid "Private %s> %s" msgstr "Privé %s> %s" -#: src/irc/irc-recv.c:1248 +#: src/irc/irc-recv.c:1251 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1368 +#: src/irc/irc-recv.c:1371 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1396 +#: src/irc/irc-recv.c:1399 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1401 +#: src/irc/irc-recv.c:1404 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1407 +#: src/irc/irc-recv.c:1410 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1498 +#: src/irc/irc-recv.c:1501 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1572 +#: src/irc/irc-recv.c:1575 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:1935 +#: src/irc/irc-recv.c:1938 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:1943 +#: src/irc/irc-recv.c:1946 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:1943 +#: src/irc/irc-recv.c:1946 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:1953 +#: src/irc/irc-recv.c:1956 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:1953 +#: src/irc/irc-recv.c:1956 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:1959 +#: src/irc/irc-recv.c:1962 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:1959 +#: src/irc/irc-recv.c:1962 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:1965 +#: src/irc/irc-recv.c:1968 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:1965 +#: src/irc/irc-recv.c:1968 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:1970 +#: src/irc/irc-recv.c:1973 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:2058 +#: src/irc/irc-recv.c:2061 msgid "Channels: " msgstr "Canauxs: " -#: src/irc/irc-recv.c:2309 +#: src/irc/irc-recv.c:2312 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2351 +#: src/irc/irc-recv.c:2354 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2355 +#: src/irc/irc-recv.c:2358 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2371 src/irc/irc-recv.c:2451 +#: src/irc/irc-recv.c:2374 src/irc/irc-recv.c:2454 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2417 +#: src/irc/irc-recv.c:2420 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2435 +#: src/irc/irc-recv.c:2438 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2443 +#: src/irc/irc-recv.c:2446 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" "%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2572 +#: src/irc/irc-recv.c:2575 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:2679 +#: src/irc/irc-recv.c:2682 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n" -#: src/irc/irc-recv.c:2732 +#: src/irc/irc-recv.c:2735 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:2752 +#: src/irc/irc-recv.c:2755 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:2763 +#: src/irc/irc-recv.c:2766 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:2763 +#: src/irc/irc-recv.c:2766 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:2771 +#: src/irc/irc-recv.c:2774 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:2771 +#: src/irc/irc-recv.c:2774 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:2780 +#: src/irc/irc-recv.c:2783 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:2780 +#: src/irc/irc-recv.c:2783 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:2789 +#: src/irc/irc-recv.c:2792 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:2789 +#: src/irc/irc-recv.c:2792 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:2798 +#: src/irc/irc-recv.c:2801 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:2831 +#: src/irc/irc-recv.c:2834 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd " "nom d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2842 +#: src/irc/irc-recv.c:2845 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai du 3ème nom " "d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2851 +#: src/irc/irc-recv.c:2854 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1618,11 +1618,16 @@ msgstr "" "%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire " "insuffisante)\n" -#: src/gui/curses/gui-display.c:919 -msgid "[not connected] " -msgstr "[non connecté] " +#: src/gui/curses/gui-display.c:921 +#, c-format +msgid "%d:[not connected] " +msgstr "%d:[non connecté] " -#: src/gui/curses/gui-display.c:927 src/gui/curses/gui-display.c:930 +#: src/gui/curses/gui-display.c:929 +msgid "Act: " +msgstr "Act: " + +#: src/gui/curses/gui-display.c:961 src/gui/curses/gui-display.c:964 msgid "-MORE-" msgstr "-PLUS-" @@ -1635,12 +1640,12 @@ msgstr "serveur" msgid "%s not enough memory for infobar message\n" msgstr "%s pas assez de mémoire pour un message de la barre d'infos\n" -#: src/gui/gui-common.c:421 +#: src/gui/gui-common.c:423 #, c-format msgid "%s not enough memory for new line!\n" msgstr "%s pas assez de mémoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:464 +#: src/gui/gui-common.c:466 msgid "not enough memory!\n" msgstr "pas assez de mémoire !\n" diff --git a/po/weechat.pot b/po/weechat.pot index 162d02377..8ad49eed8 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: 2004-06-27 15:36+0200\n" +"POT-Creation-Date: 2004-07-03 15:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/irc/irc-nick.c:186 +#: src/irc/irc-nick.c:170 #, c-format msgid "%s cannot allocate new nick\n" msgstr "" @@ -1046,7 +1046,7 @@ msgstr "" msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2862 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2865 msgid "unknown" msgstr "" @@ -1068,12 +1068,12 @@ msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" #: src/irc/irc-send.c:481 src/irc/irc-send.c:503 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:990 +#: src/irc/irc-recv.c:993 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1151 +#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1154 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" @@ -1098,7 +1098,7 @@ msgid " has joined " msgstr "" #: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:999 src/irc/irc-recv.c:2362 src/irc/irc-recv.c:2427 +#: src/irc/irc-recv.c:1002 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2430 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" @@ -1200,7 +1200,7 @@ msgid "removes voice from" msgstr "" #: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1216 +#: src/irc/irc-recv.c:1219 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "" @@ -1245,211 +1245,211 @@ msgstr "" msgid " has left " msgstr "" -#: src/irc/irc-recv.c:953 +#: src/irc/irc-recv.c:955 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:976 +#: src/irc/irc-recv.c:979 #, c-format msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:1044 +#: src/irc/irc-recv.c:1047 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:1046 +#: src/irc/irc-recv.c:1049 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:1048 +#: src/irc/irc-recv.c:1051 msgid "from" msgstr "" -#: src/irc/irc-recv.c:1083 src/irc/irc-recv.c:1097 src/irc/irc-recv.c:1112 -#: src/irc/irc-recv.c:1127 src/irc/irc-recv.c:1193 src/irc/irc-recv.c:2648 -#: src/irc/irc-recv.c:2688 +#: src/irc/irc-recv.c:1086 src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1115 +#: src/irc/irc-recv.c:1130 src/irc/irc-recv.c:1196 src/irc/irc-recv.c:2651 +#: src/irc/irc-recv.c:2691 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:1175 +#: src/irc/irc-recv.c:1178 #, c-format msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1248 +#: src/irc/irc-recv.c:1251 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1368 +#: src/irc/irc-recv.c:1371 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1396 +#: src/irc/irc-recv.c:1399 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1401 +#: src/irc/irc-recv.c:1404 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1407 +#: src/irc/irc-recv.c:1410 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1498 +#: src/irc/irc-recv.c:1501 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1572 +#: src/irc/irc-recv.c:1575 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:1935 +#: src/irc/irc-recv.c:1938 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:1943 +#: src/irc/irc-recv.c:1946 msgid "days" msgstr "" -#: src/irc/irc-recv.c:1943 +#: src/irc/irc-recv.c:1946 msgid "day" msgstr "" -#: src/irc/irc-recv.c:1953 +#: src/irc/irc-recv.c:1956 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:1953 +#: src/irc/irc-recv.c:1956 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:1959 +#: src/irc/irc-recv.c:1962 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:1959 +#: src/irc/irc-recv.c:1962 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:1965 +#: src/irc/irc-recv.c:1968 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:1965 +#: src/irc/irc-recv.c:1968 msgid "second" msgstr "" -#: src/irc/irc-recv.c:1970 +#: src/irc/irc-recv.c:1973 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:2058 +#: src/irc/irc-recv.c:2061 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2309 +#: src/irc/irc-recv.c:2312 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2351 +#: src/irc/irc-recv.c:2354 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2355 +#: src/irc/irc-recv.c:2358 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2371 src/irc/irc-recv.c:2451 +#: src/irc/irc-recv.c:2374 src/irc/irc-recv.c:2454 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2417 +#: src/irc/irc-recv.c:2420 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2435 +#: src/irc/irc-recv.c:2438 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2443 +#: src/irc/irc-recv.c:2446 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2572 +#: src/irc/irc-recv.c:2575 msgid " on " msgstr "" -#: src/irc/irc-recv.c:2679 +#: src/irc/irc-recv.c:2682 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2732 +#: src/irc/irc-recv.c:2735 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:2752 +#: src/irc/irc-recv.c:2755 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:2763 +#: src/irc/irc-recv.c:2766 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:2763 +#: src/irc/irc-recv.c:2766 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:2771 +#: src/irc/irc-recv.c:2774 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:2771 +#: src/irc/irc-recv.c:2774 msgid "op" msgstr "" -#: src/irc/irc-recv.c:2780 +#: src/irc/irc-recv.c:2783 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:2780 +#: src/irc/irc-recv.c:2783 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:2789 +#: src/irc/irc-recv.c:2792 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:2789 +#: src/irc/irc-recv.c:2792 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:2798 +#: src/irc/irc-recv.c:2801 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:2831 +#: src/irc/irc-recv.c:2834 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2842 +#: src/irc/irc-recv.c:2845 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2851 +#: src/irc/irc-recv.c:2854 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1511,11 +1511,16 @@ msgstr "" msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" -#: src/gui/curses/gui-display.c:919 -msgid "[not connected] " +#: src/gui/curses/gui-display.c:921 +#, c-format +msgid "%d:[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:927 src/gui/curses/gui-display.c:930 +#: src/gui/curses/gui-display.c:929 +msgid "Act: " +msgstr "" + +#: src/gui/curses/gui-display.c:961 src/gui/curses/gui-display.c:964 msgid "-MORE-" msgstr "" @@ -1528,12 +1533,12 @@ msgstr "" msgid "%s not enough memory for infobar message\n" msgstr "" -#: src/gui/gui-common.c:421 +#: src/gui/gui-common.c:423 #, c-format msgid "%s not enough memory for new line!\n" msgstr "" -#: src/gui/gui-common.c:464 +#: src/gui/gui-common.c:466 msgid "not enough memory!\n" msgstr "" diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c index ccbec9a83..92ff21880 100644 --- a/src/common/weeconfig.c +++ b/src/common/weeconfig.c @@ -172,8 +172,8 @@ int cfg_col_chat_dark; int cfg_col_chat_highlight; int cfg_col_chat_bg; int cfg_col_status; -int cfg_col_status_active; int cfg_col_status_data_msg; +int cfg_col_status_data_highlight; int cfg_col_status_data_other; int cfg_col_status_more; int cfg_col_status_bg; @@ -255,14 +255,14 @@ t_config_option weechat_options_colors[] = N_("color for status bar"), OPTION_TYPE_COLOR, 0, 0, 0, "gray", NULL, &cfg_col_status, NULL, &config_change_color }, - { "col_status_active", N_("color for active window"), - N_("color for active window (status bar)"), - OPTION_TYPE_COLOR, 0, 0, 0, - "yellow", NULL, &cfg_col_status_active, NULL, &config_change_color }, { "col_status_data_msg", N_("color for window with new messages"), N_("color for window with new messages (status bar)"), OPTION_TYPE_COLOR, 0, 0, 0, "lightred", NULL, &cfg_col_status_data_msg, NULL, &config_change_color }, + { "col_status_highlight", N_("color for window with highlight"), + N_("color for window with highlight (status bar)"), + OPTION_TYPE_COLOR, 0, 0, 0, + "yellow", NULL, &cfg_col_status_data_highlight, NULL, &config_change_color }, { "col_status_data_other", N_("color for window with new data (not messages)"), N_("color for window with new data (not messages) (status bar)"), OPTION_TYPE_COLOR, 0, 0, 0, diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h index 4cba0be79..692b3690a 100644 --- a/src/common/weeconfig.h +++ b/src/common/weeconfig.h @@ -106,8 +106,8 @@ extern int cfg_col_chat_dark; extern int cfg_col_chat_highlight; extern int cfg_col_chat_bg; extern int cfg_col_status; -extern int cfg_col_status_active; extern int cfg_col_status_data_msg; +extern int cfg_col_status_data_highlight; extern int cfg_col_status_data_other; extern int cfg_col_status_more; extern int cfg_col_status_bg; diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index e9ca77e21..5decef5d0 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -35,6 +35,7 @@ #include "../../common/weechat.h" #include "../gui.h" #include "../../common/weeconfig.h" +#include "../../common/hotlist.h" #include "../../irc/irc.h" @@ -788,7 +789,7 @@ void gui_draw_buffer_status (t_gui_buffer *buffer, int erase) { t_gui_window *ptr_win; - t_gui_buffer *ptr_buffer; + t_weechat_hotlist *ptr_hotlist; char format_more[32]; int i, first_mode; @@ -804,120 +805,96 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) wrefresh (ptr_win->win_status); } wmove (ptr_win->win_status, 0, 0); - for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) + if (SERVER(ptr_win->buffer) && SERVER(ptr_win->buffer)->name) { - if (SERVER(ptr_buffer) && !CHANNEL(ptr_buffer)) + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, "[%s] ", SERVER(ptr_win->buffer)->name); + } + if (SERVER(ptr_win->buffer) && !CHANNEL(ptr_win->buffer)) + { + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + if (SERVER(ptr_win->buffer)->is_connected) + wprintw (ptr_win->win_status, "%d:[%s] ", + ptr_win->buffer->number, SERVER(ptr_win->buffer)->name); + else + wprintw (ptr_win->win_status, "%d:(%s) ", + ptr_win->buffer->number, SERVER(ptr_win->buffer)->name); + } + if (SERVER(ptr_win->buffer) && CHANNEL(ptr_win->buffer)) + { + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, "%d:%s", + ptr_win->buffer->number, + CHANNEL(ptr_win->buffer)->name); + if (ptr_win->buffer == CHANNEL(ptr_win->buffer)->buffer) { - if (ptr_win->buffer == SERVER(ptr_buffer)->buffer) + /* display channel modes */ + wprintw (ptr_win->win_status, "("); + i = 0; + first_mode = 1; + while (CHANNEL(ptr_win->buffer)->modes[i]) { - if (ptr_buffer->unread_data) + if (CHANNEL(ptr_win->buffer)->modes[i] != ' ') { - if (ptr_buffer->unread_data > 1) - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_MSG); - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_OTHER); - } - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_ACTIVE); - } - else - { - if (SERVER(ptr_buffer)->buffer && - ((SERVER(ptr_buffer)->buffer)->unread_data)) - { - if (SERVER(ptr_buffer)->buffer->unread_data > 1) - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_MSG); - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_OTHER); - } - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS); - } - if (SERVER(ptr_buffer)->is_connected) - wprintw (ptr_win->win_status, "%d:[%s] ", - ptr_buffer->number, SERVER(ptr_buffer)->name); - else - wprintw (ptr_win->win_status, "%d:(%s) ", - ptr_buffer->number, SERVER(ptr_buffer)->name); - } - if (SERVER(ptr_buffer) && CHANNEL(ptr_buffer)) - { - if (ptr_win->buffer == CHANNEL(ptr_buffer)->buffer) - { - if ((CHANNEL(ptr_buffer)->buffer) && - (CHANNEL(ptr_buffer)->buffer->unread_data)) - { - if (CHANNEL(ptr_buffer)->buffer->unread_data > 1) - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_MSG); - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_OTHER); - } - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_ACTIVE); - } - else - { - if ((CHANNEL(ptr_buffer)->buffer) && - (CHANNEL(ptr_buffer)->buffer->unread_data)) - { - if (CHANNEL(ptr_buffer)->buffer->unread_data > 1) - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_MSG); - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_OTHER); - } - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS); - } - wprintw (ptr_win->win_status, "%d:%s", - ptr_buffer->number, - CHANNEL(ptr_buffer)->name); - if (ptr_win->buffer == CHANNEL(ptr_buffer)->buffer) - { - /* display channel modes */ - wprintw (ptr_win->win_status, "("); - i = 0; - first_mode = 1; - while (CHANNEL(ptr_buffer)->modes[i]) - { - if (CHANNEL(ptr_buffer)->modes[i] != ' ') + if (first_mode) { - if (first_mode) - { - wprintw (ptr_win->win_status, "+"); - first_mode = 0; - } - wprintw (ptr_win->win_status, "%c", - CHANNEL(ptr_buffer)->modes[i]); + wprintw (ptr_win->win_status, "+"); + first_mode = 0; } - i++; + wprintw (ptr_win->win_status, "%c", + CHANNEL(ptr_win->buffer)->modes[i]); } - if (CHANNEL(ptr_buffer)->modes[CHANNEL_MODE_KEY] != ' ') - wprintw (ptr_win->win_status, ",%s", - CHANNEL(ptr_buffer)->key); - if (CHANNEL(ptr_buffer)->modes[CHANNEL_MODE_LIMIT] != ' ') - wprintw (ptr_win->win_status, ",%d", - CHANNEL(ptr_buffer)->limit); - wprintw (ptr_win->win_status, ")"); + i++; } - wprintw (ptr_win->win_status, " "); + if (CHANNEL(ptr_win->buffer)->modes[CHANNEL_MODE_KEY] != ' ') + wprintw (ptr_win->win_status, ",%s", + CHANNEL(ptr_win->buffer)->key); + if (CHANNEL(ptr_win->buffer)->modes[CHANNEL_MODE_LIMIT] != ' ') + wprintw (ptr_win->win_status, ",%d", + CHANNEL(ptr_win->buffer)->limit); + wprintw (ptr_win->win_status, ")"); } - if (!SERVER(ptr_buffer)) + wprintw (ptr_win->win_status, " "); + } + if (!SERVER(ptr_win->buffer)) + { + gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, _("%d:[not connected] "), + ptr_win->buffer->number); + } + + /* display list of other active windows (if any) with numbers */ + if (hotlist) + { + gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, _("Act: ")); + for (ptr_hotlist = hotlist; ptr_hotlist; + ptr_hotlist = ptr_hotlist->next_hotlist) { - gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS); - wprintw (ptr_win->win_status, _("%d:[not connected] "), - ptr_buffer->number); + switch (ptr_hotlist->priority) + { + case 0: + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS_DATA_OTHER); + break; + case 1: + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS_DATA_MSG); + break; + case 2: + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS_DATA_HIGHLIGHT); + break; + } + wprintw (ptr_win->win_status, "%d", + ptr_hotlist->buffer->number); + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + if (ptr_hotlist->next_hotlist) + wprintw (ptr_win->win_status, ","); } } @@ -1239,6 +1216,8 @@ gui_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer) buffer->num_displayed++; buffer->unread_data = 0; + + hotlist_remove_buffer (buffer); } /* @@ -1498,10 +1477,10 @@ gui_init_colors () cfg_col_chat_highlight & A_CHARTEXT, cfg_col_chat_bg); init_pair (COLOR_WIN_STATUS, cfg_col_status & A_CHARTEXT, cfg_col_status_bg); - init_pair (COLOR_WIN_STATUS_ACTIVE, - cfg_col_status_active & A_CHARTEXT, cfg_col_status_bg); init_pair (COLOR_WIN_STATUS_DATA_MSG, cfg_col_status_data_msg & A_CHARTEXT, cfg_col_status_bg); + init_pair (COLOR_WIN_STATUS_DATA_HIGHLIGHT, + cfg_col_status_data_highlight & A_CHARTEXT, cfg_col_status_bg); init_pair (COLOR_WIN_STATUS_DATA_OTHER, cfg_col_status_data_other & A_CHARTEXT, cfg_col_status_bg); init_pair (COLOR_WIN_STATUS_MORE, @@ -1552,8 +1531,8 @@ gui_init_colors () color_attr[COLOR_WIN_CHAT_DARK - 1] = cfg_col_chat_dark & A_BOLD; color_attr[COLOR_WIN_CHAT_HIGHLIGHT - 1] = cfg_col_chat_highlight & A_BOLD; color_attr[COLOR_WIN_STATUS - 1] = cfg_col_status & A_BOLD; - color_attr[COLOR_WIN_STATUS_ACTIVE - 1] = cfg_col_status_active & A_BOLD; color_attr[COLOR_WIN_STATUS_DATA_MSG - 1] = cfg_col_status_data_msg & A_BOLD; + color_attr[COLOR_WIN_STATUS_DATA_HIGHLIGHT - 1] = cfg_col_status_data_highlight & A_BOLD; color_attr[COLOR_WIN_STATUS_DATA_OTHER - 1] = cfg_col_status_data_other & A_BOLD; color_attr[COLOR_WIN_STATUS_MORE - 1] = cfg_col_status_more & A_BOLD; color_attr[COLOR_WIN_INFOBAR - 1] = cfg_col_infobar & A_BOLD; @@ -1703,6 +1682,7 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) if (buffer->unread_data < 1 + buffer->last_line->line_with_message) { buffer->unread_data = 1 + buffer->last_line->line_with_message; + hotlist_add (buffer->last_line->line_with_message, buffer); gui_draw_buffer_status (buffer, 1); } } diff --git a/src/gui/curses/gui-input.c b/src/gui/curses/gui-input.c index 3e98619a1..179d962d7 100644 --- a/src/gui/curses/gui-input.c +++ b/src/gui/curses/gui-input.c @@ -37,6 +37,7 @@ #include "../gui.h" #include "../../common/weeconfig.h" #include "../../common/command.h" +#include "../../common/hotlist.h" #include "../../irc/irc.h" #define KEY_ESCAPE 27 @@ -62,6 +63,16 @@ gui_read_keyb () gui_calculate_pos_size (gui_current_window); gui_redraw_buffer (gui_current_window->buffer); break; + /* inactive function keys */ + case KEY_F(1): + case KEY_F(2): + case KEY_F(3): + case KEY_F(4): + case KEY_F(5): + case KEY_F(9): + case KEY_F(11): + case KEY_F(12): + break; /* previous buffer in window */ case KEY_F(6): gui_switch_to_previous_buffer (gui_current_window); @@ -316,6 +327,26 @@ gui_read_keyb () } } break; + /* Alt-A */ + case 'a': + case 'A': + if (hotlist) + { + if (!hotlist_initial_buffer) + hotlist_initial_buffer = gui_current_window->buffer; + gui_switch_to_buffer (gui_current_window, hotlist->buffer); + gui_redraw_buffer (gui_current_window->buffer); + } + else + { + if (hotlist_initial_buffer) + { + gui_switch_to_buffer (gui_current_window, hotlist_initial_buffer); + gui_redraw_buffer (gui_current_window->buffer); + hotlist_initial_buffer = NULL; + } + } + break; } } break; @@ -341,8 +372,8 @@ gui_read_keyb () break; /* other key => add to input buffer */ default: - /*gui_printf (gui_current_buffer, - "[Debug] key pressed = %d, as octal: %o\n", key, key);*/ + /*gui_printf (gui_current_window->buffer, + "[Debug] key pressed = %d, as octal: %o\n", key, key);*/ new_char[0] = key; new_char[1] = '\0'; gui_buffer_insert_string (gui_current_window->buffer, diff --git a/src/gui/gui.h b/src/gui/gui.h index 6203e2238..1066d478d 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -26,38 +26,38 @@ #define INPUT_BUFFER_BLOCK_SIZE 256 -#define NUM_COLORS 38 -#define COLOR_WIN_TITLE 1 -#define COLOR_WIN_CHAT 2 -#define COLOR_WIN_CHAT_TIME 3 -#define COLOR_WIN_CHAT_TIME_SEP 4 -#define COLOR_WIN_CHAT_PREFIX1 5 -#define COLOR_WIN_CHAT_PREFIX2 6 -#define COLOR_WIN_CHAT_NICK 7 -#define COLOR_WIN_CHAT_HOST 8 -#define COLOR_WIN_CHAT_CHANNEL 9 -#define COLOR_WIN_CHAT_DARK 10 -#define COLOR_WIN_CHAT_HIGHLIGHT 11 -#define COLOR_WIN_STATUS 12 -#define COLOR_WIN_STATUS_ACTIVE 13 -#define COLOR_WIN_STATUS_DATA_MSG 14 -#define COLOR_WIN_STATUS_DATA_OTHER 15 -#define COLOR_WIN_STATUS_MORE 16 -#define COLOR_WIN_INFOBAR 17 -#define COLOR_WIN_INFOBAR_HIGHLIGHT 18 -#define COLOR_WIN_INPUT 19 -#define COLOR_WIN_INPUT_CHANNEL 20 -#define COLOR_WIN_INPUT_NICK 21 -#define COLOR_WIN_NICK 22 -#define COLOR_WIN_NICK_OP 23 -#define COLOR_WIN_NICK_HALFOP 24 -#define COLOR_WIN_NICK_VOICE 25 -#define COLOR_WIN_NICK_SEP 26 -#define COLOR_WIN_NICK_SELF 27 -#define COLOR_WIN_NICK_PRIVATE 28 -#define COLOR_WIN_NICK_FIRST 29 -#define COLOR_WIN_NICK_LAST 38 -#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1) +#define NUM_COLORS 38 +#define COLOR_WIN_TITLE 1 +#define COLOR_WIN_CHAT 2 +#define COLOR_WIN_CHAT_TIME 3 +#define COLOR_WIN_CHAT_TIME_SEP 4 +#define COLOR_WIN_CHAT_PREFIX1 5 +#define COLOR_WIN_CHAT_PREFIX2 6 +#define COLOR_WIN_CHAT_NICK 7 +#define COLOR_WIN_CHAT_HOST 8 +#define COLOR_WIN_CHAT_CHANNEL 9 +#define COLOR_WIN_CHAT_DARK 10 +#define COLOR_WIN_CHAT_HIGHLIGHT 11 +#define COLOR_WIN_STATUS 12 +#define COLOR_WIN_STATUS_DATA_MSG 13 +#define COLOR_WIN_STATUS_DATA_HIGHLIGHT 14 +#define COLOR_WIN_STATUS_DATA_OTHER 15 +#define COLOR_WIN_STATUS_MORE 16 +#define COLOR_WIN_INFOBAR 17 +#define COLOR_WIN_INFOBAR_HIGHLIGHT 18 +#define COLOR_WIN_INPUT 19 +#define COLOR_WIN_INPUT_CHANNEL 20 +#define COLOR_WIN_INPUT_NICK 21 +#define COLOR_WIN_NICK 22 +#define COLOR_WIN_NICK_OP 23 +#define COLOR_WIN_NICK_HALFOP 24 +#define COLOR_WIN_NICK_VOICE 25 +#define COLOR_WIN_NICK_SEP 26 +#define COLOR_WIN_NICK_SELF 27 +#define COLOR_WIN_NICK_PRIVATE 28 +#define COLOR_WIN_NICK_FIRST 29 +#define COLOR_WIN_NICK_LAST 38 +#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1) #define SERVER(buffer) ((t_irc_server *)(buffer->server)) #define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel)) diff --git a/src/irc/irc-nick.c b/src/irc/irc-nick.c index 3c90c4ef6..e2e0e578c 100644 --- a/src/irc/irc-nick.c +++ b/src/irc/irc-nick.c @@ -37,12 +37,12 @@ */ int -nick_find_color (t_irc_channel *channel, t_irc_nick *nick) +nick_find_color (t_irc_nick *nick) { int i, color; color = 0; - for (i = 0; i < strlen(nick->nick); i++) + for (i = strlen (nick->nick) - 1; i >= 0; i--) { color += (int)(nick->nick[i]); } @@ -179,7 +179,7 @@ nick_new (t_irc_channel *channel, char *nick_name, if (strcasecmp (new_nick->nick, SERVER(channel->buffer)->nick) == 0) new_nick->color = COLOR_WIN_NICK_SELF; else - new_nick->color = nick_find_color (channel, new_nick); + new_nick->color = nick_find_color (new_nick); nick_insert_sorted (channel, new_nick); @@ -222,7 +222,7 @@ nick_change (t_irc_channel *channel, t_irc_nick *nick, char *new_nick) if (strcasecmp (nick->nick, SERVER(channel->buffer)->nick) == 0) nick->color = COLOR_WIN_NICK_SELF; else - nick->color = nick_find_color (channel, nick); + nick->color = nick_find_color (nick); /* insert again nick into sorted list */ nick_resort (channel, nick); diff --git a/weechat/ChangeLog b/weechat/ChangeLog index f23c60e7b..17b60a71f 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -5,8 +5,8 @@ ChangeLog - 2004-07-03 Version 0.0.7 (under dev!): - * windows management improved: buffers ordered by number, split terminal - horizontally/vertically + * buffers ordered by number, auto-switch to active buffers (alt-a) + * split terminal horizontally/vertically * unique color for each nick (based on nickname) * action messages are now considered as messages, not crappy joins/parts * fixed display bug when nicklist is displayed at bottom of screen diff --git a/weechat/TODO b/weechat/TODO index 65f0628e4..a33d7f85d 100644 --- a/weechat/TODO +++ b/weechat/TODO @@ -22,7 +22,7 @@ v0.0.7: * Interface: + split terminal in multiple windows (horizontally/vertically) - + hotlist (channels with activity) and auto-jump to channels + + hotlist (channels with activity) and auto-switch to channels + internationalization (traduce WeeChat in many languages) * Configuration: diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 9d728f7d6..1fe44807a 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.0.7-pre2\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2004-06-27 15:36+0200\n" +"POT-Creation-Date: 2004-07-03 15:08+0200\n" "PO-Revision-Date: 2004-06-05 10:52+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/irc/irc-nick.c:186 +#: src/irc/irc-nick.c:170 #, c-format msgid "%s cannot allocate new nick\n" msgstr "%s ompossible d'allouer un nouveau pseudo\n" @@ -1137,7 +1137,7 @@ msgstr "drapeau de mode inconnu" msgid "can't change mode for other users" msgstr "impossible de changer le mode pour les autres utilisateurs" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2862 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2865 msgid "unknown" msgstr "inconnu" @@ -1162,12 +1162,12 @@ msgstr "" "%s la commande \"%s\" ne peut pas être exécutée dans une fenêtre serveur\n" #: src/irc/irc-send.c:481 src/irc/irc-send.c:503 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:990 +#: src/irc/irc-recv.c:993 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "%s utilisateur non trouvé pour la commande \"%s\"\n" -#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1151 +#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1154 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "%s impossible de créer la fenêtre privée \"%s\"\n" @@ -1192,7 +1192,7 @@ msgid " has joined " msgstr " a rejoint " #: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:999 src/irc/irc-recv.c:2362 src/irc/irc-recv.c:2427 +#: src/irc/irc-recv.c:1002 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2430 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "%s canal non trouvé pour la commande \"%s\"\n" @@ -1294,7 +1294,7 @@ msgid "removes voice from" msgstr "supprime la voix de" #: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1216 +#: src/irc/irc-recv.c:1219 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "%s commande \"%s\" reçue sans host\n" @@ -1339,216 +1339,216 @@ msgstr "%s commande \"%s\" re msgid " has left " msgstr " a quitté " -#: src/irc/irc-recv.c:953 +#: src/irc/irc-recv.c:955 #, c-format msgid "On %s: * %s %s" msgstr "Sur %s: * %s %s" -#: src/irc/irc-recv.c:976 +#: src/irc/irc-recv.c:979 #, c-format msgid "On %s: %s> %s" msgstr "Sur %s: %s> %s" -#: src/irc/irc-recv.c:1044 +#: src/irc/irc-recv.c:1047 msgid "Received a " msgstr "Reçu un " -#: src/irc/irc-recv.c:1046 +#: src/irc/irc-recv.c:1049 msgid "CTCP VERSION " msgstr "CTCP VERSION " -#: src/irc/irc-recv.c:1048 +#: src/irc/irc-recv.c:1051 msgid "from" msgstr "de" -#: src/irc/irc-recv.c:1083 src/irc/irc-recv.c:1097 src/irc/irc-recv.c:1112 -#: src/irc/irc-recv.c:1127 src/irc/irc-recv.c:1193 src/irc/irc-recv.c:2648 -#: src/irc/irc-recv.c:2688 +#: src/irc/irc-recv.c:1086 src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1115 +#: src/irc/irc-recv.c:1130 src/irc/irc-recv.c:1196 src/irc/irc-recv.c:2651 +#: src/irc/irc-recv.c:2691 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "%s impossible d'analyser la commande \"%s\"\n" -#: src/irc/irc-recv.c:1175 +#: src/irc/irc-recv.c:1178 #, c-format msgid "Private %s> %s" msgstr "Privé %s> %s" -#: src/irc/irc-recv.c:1248 +#: src/irc/irc-recv.c:1251 msgid "has quit" msgstr "a quitté" -#: src/irc/irc-recv.c:1368 +#: src/irc/irc-recv.c:1371 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "%s commande \"%s\" reçue sans canal\n" -#: src/irc/irc-recv.c:1396 +#: src/irc/irc-recv.c:1399 msgid " has changed topic for " msgstr " a changé le titre pour " -#: src/irc/irc-recv.c:1401 +#: src/irc/irc-recv.c:1404 #, c-format msgid " to: \"%s\"\n" msgstr " en: \"%s\"\n" -#: src/irc/irc-recv.c:1407 +#: src/irc/irc-recv.c:1410 msgid " has unset topic for " msgstr " a retiré le titre pour " -#: src/irc/irc-recv.c:1498 +#: src/irc/irc-recv.c:1501 #, c-format msgid " is away: %s\n" msgstr " est absent: %s\n" -#: src/irc/irc-recv.c:1572 +#: src/irc/irc-recv.c:1575 msgid "Users online: " msgstr "Utilisateurs en ligne: " -#: src/irc/irc-recv.c:1935 +#: src/irc/irc-recv.c:1938 msgid "idle: " msgstr "inactivité: " -#: src/irc/irc-recv.c:1943 +#: src/irc/irc-recv.c:1946 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:1943 +#: src/irc/irc-recv.c:1946 msgid "day" msgstr "jour" -#: src/irc/irc-recv.c:1953 +#: src/irc/irc-recv.c:1956 msgid "hours" msgstr "heures" -#: src/irc/irc-recv.c:1953 +#: src/irc/irc-recv.c:1956 msgid "hour" msgstr "heure" -#: src/irc/irc-recv.c:1959 +#: src/irc/irc-recv.c:1962 msgid "minutes" msgstr "minutes" -#: src/irc/irc-recv.c:1959 +#: src/irc/irc-recv.c:1962 msgid "minute" msgstr "minute" -#: src/irc/irc-recv.c:1965 +#: src/irc/irc-recv.c:1968 msgid "seconds" msgstr "secondes" -#: src/irc/irc-recv.c:1965 +#: src/irc/irc-recv.c:1968 msgid "second" msgstr "seconde" -#: src/irc/irc-recv.c:1970 +#: src/irc/irc-recv.c:1973 msgid "signon at: " msgstr "signé le: " -#: src/irc/irc-recv.c:2058 +#: src/irc/irc-recv.c:2061 msgid "Channels: " msgstr "Canauxs: " -#: src/irc/irc-recv.c:2309 +#: src/irc/irc-recv.c:2312 msgid "No topic set for " msgstr "Pas de titre défini pour " -#: src/irc/irc-recv.c:2351 +#: src/irc/irc-recv.c:2354 msgid "Topic for " msgstr "Le titre pour " -#: src/irc/irc-recv.c:2355 +#: src/irc/irc-recv.c:2358 #, c-format msgid " is: \"%s\"\n" msgstr " est: \"%s\"\n" -#: src/irc/irc-recv.c:2371 src/irc/irc-recv.c:2451 +#: src/irc/irc-recv.c:2374 src/irc/irc-recv.c:2454 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "%s impossible de déterminer le canal pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2417 +#: src/irc/irc-recv.c:2420 msgid "Topic set by " msgstr "Titre défini par " -#: src/irc/irc-recv.c:2435 +#: src/irc/irc-recv.c:2438 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "%s impossible d'identifier la date/heure pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2443 +#: src/irc/irc-recv.c:2446 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" "%s impossible de déterminer le nom d'utilisateur pour la commande \"%s\"\n" -#: src/irc/irc-recv.c:2572 +#: src/irc/irc-recv.c:2575 msgid " on " msgstr " sur " -#: src/irc/irc-recv.c:2679 +#: src/irc/irc-recv.c:2682 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "%s impossible de créer l'utilisateur \"%s\" pour le canal \"%s\"\n" -#: src/irc/irc-recv.c:2732 +#: src/irc/irc-recv.c:2735 msgid "Nicks " msgstr "Utilisateurs " -#: src/irc/irc-recv.c:2752 +#: src/irc/irc-recv.c:2755 msgid "Channel " msgstr "Canal " -#: src/irc/irc-recv.c:2763 +#: src/irc/irc-recv.c:2766 msgid "nicks" msgstr "utilisateurs" -#: src/irc/irc-recv.c:2763 +#: src/irc/irc-recv.c:2766 msgid "nick" msgstr "utilisateur" -#: src/irc/irc-recv.c:2771 +#: src/irc/irc-recv.c:2774 msgid "ops" msgstr "ops" -#: src/irc/irc-recv.c:2771 +#: src/irc/irc-recv.c:2774 msgid "op" msgstr "op" -#: src/irc/irc-recv.c:2780 +#: src/irc/irc-recv.c:2783 msgid "halfops" msgstr "halfops" -#: src/irc/irc-recv.c:2780 +#: src/irc/irc-recv.c:2783 msgid "halfop" msgstr "halfop" -#: src/irc/irc-recv.c:2789 +#: src/irc/irc-recv.c:2792 msgid "voices" msgstr "voices" -#: src/irc/irc-recv.c:2789 +#: src/irc/irc-recv.c:2792 msgid "voice" msgstr "voice" -#: src/irc/irc-recv.c:2798 +#: src/irc/irc-recv.c:2801 msgid "normal" msgstr "normal" -#: src/irc/irc-recv.c:2831 +#: src/irc/irc-recv.c:2834 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai avec le 2nd " "nom d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2842 +#: src/irc/irc-recv.c:2845 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" "%s: l'utilisateur \"%s\" est déjà en cours d'utilisation, essai du 3ème nom " "d'utilisateur \"%s\"\n" -#: src/irc/irc-recv.c:2851 +#: src/irc/irc-recv.c:2854 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1618,11 +1618,16 @@ msgstr "" "%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire " "insuffisante)\n" -#: src/gui/curses/gui-display.c:919 -msgid "[not connected] " -msgstr "[non connecté] " +#: src/gui/curses/gui-display.c:921 +#, c-format +msgid "%d:[not connected] " +msgstr "%d:[non connecté] " -#: src/gui/curses/gui-display.c:927 src/gui/curses/gui-display.c:930 +#: src/gui/curses/gui-display.c:929 +msgid "Act: " +msgstr "Act: " + +#: src/gui/curses/gui-display.c:961 src/gui/curses/gui-display.c:964 msgid "-MORE-" msgstr "-PLUS-" @@ -1635,12 +1640,12 @@ msgstr "serveur" msgid "%s not enough memory for infobar message\n" msgstr "%s pas assez de mémoire pour un message de la barre d'infos\n" -#: src/gui/gui-common.c:421 +#: src/gui/gui-common.c:423 #, c-format msgid "%s not enough memory for new line!\n" msgstr "%s pas assez de mémoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:464 +#: src/gui/gui-common.c:466 msgid "not enough memory!\n" msgstr "pas assez de mémoire !\n" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index 162d02377..8ad49eed8 100644 --- a/weechat/po/weechat.pot +++ b/weechat/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: 2004-06-27 15:36+0200\n" +"POT-Creation-Date: 2004-07-03 15:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/irc/irc-nick.c:186 +#: src/irc/irc-nick.c:170 #, c-format msgid "%s cannot allocate new nick\n" msgstr "" @@ -1046,7 +1046,7 @@ msgstr "" msgid "can't change mode for other users" msgstr "" -#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2862 +#: src/irc/irc-send.c:58 src/irc/irc-recv.c:2865 msgid "unknown" msgstr "" @@ -1068,12 +1068,12 @@ msgid "%s \"%s\" command can not be executed on a server window\n" msgstr "" #: src/irc/irc-send.c:481 src/irc/irc-send.c:503 src/irc/irc-recv.c:261 -#: src/irc/irc-recv.c:990 +#: src/irc/irc-recv.c:993 #, c-format msgid "%s nick not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1151 +#: src/irc/irc-send.c:517 src/irc/irc-send.c:757 src/irc/irc-recv.c:1154 #, c-format msgid "%s cannot create new private window \"%s\"\n" msgstr "" @@ -1098,7 +1098,7 @@ msgid " has joined " msgstr "" #: src/irc/irc-recv.c:229 src/irc/irc-recv.c:581 src/irc/irc-recv.c:865 -#: src/irc/irc-recv.c:999 src/irc/irc-recv.c:2362 src/irc/irc-recv.c:2427 +#: src/irc/irc-recv.c:1002 src/irc/irc-recv.c:2365 src/irc/irc-recv.c:2430 #, c-format msgid "%s channel not found for \"%s\" command\n" msgstr "" @@ -1200,7 +1200,7 @@ msgid "removes voice from" msgstr "" #: src/irc/irc-recv.c:538 src/irc/irc-recv.c:611 src/irc/irc-recv.c:907 -#: src/irc/irc-recv.c:1216 +#: src/irc/irc-recv.c:1219 #, c-format msgid "%s \"%s\" command received without host\n" msgstr "" @@ -1245,211 +1245,211 @@ msgstr "" msgid " has left " msgstr "" -#: src/irc/irc-recv.c:953 +#: src/irc/irc-recv.c:955 #, c-format msgid "On %s: * %s %s" msgstr "" -#: src/irc/irc-recv.c:976 +#: src/irc/irc-recv.c:979 #, c-format msgid "On %s: %s> %s" msgstr "" -#: src/irc/irc-recv.c:1044 +#: src/irc/irc-recv.c:1047 msgid "Received a " msgstr "" -#: src/irc/irc-recv.c:1046 +#: src/irc/irc-recv.c:1049 msgid "CTCP VERSION " msgstr "" -#: src/irc/irc-recv.c:1048 +#: src/irc/irc-recv.c:1051 msgid "from" msgstr "" -#: src/irc/irc-recv.c:1083 src/irc/irc-recv.c:1097 src/irc/irc-recv.c:1112 -#: src/irc/irc-recv.c:1127 src/irc/irc-recv.c:1193 src/irc/irc-recv.c:2648 -#: src/irc/irc-recv.c:2688 +#: src/irc/irc-recv.c:1086 src/irc/irc-recv.c:1100 src/irc/irc-recv.c:1115 +#: src/irc/irc-recv.c:1130 src/irc/irc-recv.c:1196 src/irc/irc-recv.c:2651 +#: src/irc/irc-recv.c:2691 #, c-format msgid "%s cannot parse \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:1175 +#: src/irc/irc-recv.c:1178 #, c-format msgid "Private %s> %s" msgstr "" -#: src/irc/irc-recv.c:1248 +#: src/irc/irc-recv.c:1251 msgid "has quit" msgstr "" -#: src/irc/irc-recv.c:1368 +#: src/irc/irc-recv.c:1371 #, c-format msgid "%s \"%s\" command received without channel\n" msgstr "" -#: src/irc/irc-recv.c:1396 +#: src/irc/irc-recv.c:1399 msgid " has changed topic for " msgstr "" -#: src/irc/irc-recv.c:1401 +#: src/irc/irc-recv.c:1404 #, c-format msgid " to: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:1407 +#: src/irc/irc-recv.c:1410 msgid " has unset topic for " msgstr "" -#: src/irc/irc-recv.c:1498 +#: src/irc/irc-recv.c:1501 #, c-format msgid " is away: %s\n" msgstr "" -#: src/irc/irc-recv.c:1572 +#: src/irc/irc-recv.c:1575 msgid "Users online: " msgstr "" -#: src/irc/irc-recv.c:1935 +#: src/irc/irc-recv.c:1938 msgid "idle: " msgstr "" -#: src/irc/irc-recv.c:1943 +#: src/irc/irc-recv.c:1946 msgid "days" msgstr "" -#: src/irc/irc-recv.c:1943 +#: src/irc/irc-recv.c:1946 msgid "day" msgstr "" -#: src/irc/irc-recv.c:1953 +#: src/irc/irc-recv.c:1956 msgid "hours" msgstr "" -#: src/irc/irc-recv.c:1953 +#: src/irc/irc-recv.c:1956 msgid "hour" msgstr "" -#: src/irc/irc-recv.c:1959 +#: src/irc/irc-recv.c:1962 msgid "minutes" msgstr "" -#: src/irc/irc-recv.c:1959 +#: src/irc/irc-recv.c:1962 msgid "minute" msgstr "" -#: src/irc/irc-recv.c:1965 +#: src/irc/irc-recv.c:1968 msgid "seconds" msgstr "" -#: src/irc/irc-recv.c:1965 +#: src/irc/irc-recv.c:1968 msgid "second" msgstr "" -#: src/irc/irc-recv.c:1970 +#: src/irc/irc-recv.c:1973 msgid "signon at: " msgstr "" -#: src/irc/irc-recv.c:2058 +#: src/irc/irc-recv.c:2061 msgid "Channels: " msgstr "" -#: src/irc/irc-recv.c:2309 +#: src/irc/irc-recv.c:2312 msgid "No topic set for " msgstr "" -#: src/irc/irc-recv.c:2351 +#: src/irc/irc-recv.c:2354 msgid "Topic for " msgstr "" -#: src/irc/irc-recv.c:2355 +#: src/irc/irc-recv.c:2358 #, c-format msgid " is: \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2371 src/irc/irc-recv.c:2451 +#: src/irc/irc-recv.c:2374 src/irc/irc-recv.c:2454 #, c-format msgid "%s cannot identify channel for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2417 +#: src/irc/irc-recv.c:2420 msgid "Topic set by " msgstr "" -#: src/irc/irc-recv.c:2435 +#: src/irc/irc-recv.c:2438 #, c-format msgid "%s cannot identify date/time for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2443 +#: src/irc/irc-recv.c:2446 #, c-format msgid "%s cannot identify nickname for \"%s\" command\n" msgstr "" -#: src/irc/irc-recv.c:2572 +#: src/irc/irc-recv.c:2575 msgid " on " msgstr "" -#: src/irc/irc-recv.c:2679 +#: src/irc/irc-recv.c:2682 #, c-format msgid "%s cannot create nick \"%s\" for channel \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2732 +#: src/irc/irc-recv.c:2735 msgid "Nicks " msgstr "" -#: src/irc/irc-recv.c:2752 +#: src/irc/irc-recv.c:2755 msgid "Channel " msgstr "" -#: src/irc/irc-recv.c:2763 +#: src/irc/irc-recv.c:2766 msgid "nicks" msgstr "" -#: src/irc/irc-recv.c:2763 +#: src/irc/irc-recv.c:2766 msgid "nick" msgstr "" -#: src/irc/irc-recv.c:2771 +#: src/irc/irc-recv.c:2774 msgid "ops" msgstr "" -#: src/irc/irc-recv.c:2771 +#: src/irc/irc-recv.c:2774 msgid "op" msgstr "" -#: src/irc/irc-recv.c:2780 +#: src/irc/irc-recv.c:2783 msgid "halfops" msgstr "" -#: src/irc/irc-recv.c:2780 +#: src/irc/irc-recv.c:2783 msgid "halfop" msgstr "" -#: src/irc/irc-recv.c:2789 +#: src/irc/irc-recv.c:2792 msgid "voices" msgstr "" -#: src/irc/irc-recv.c:2789 +#: src/irc/irc-recv.c:2792 msgid "voice" msgstr "" -#: src/irc/irc-recv.c:2798 +#: src/irc/irc-recv.c:2801 msgid "normal" msgstr "" -#: src/irc/irc-recv.c:2831 +#: src/irc/irc-recv.c:2834 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 2nd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2842 +#: src/irc/irc-recv.c:2845 #, c-format msgid "%s: nickname \"%s\" is already in use, trying 3rd nickname \"%s\"\n" msgstr "" -#: src/irc/irc-recv.c:2851 +#: src/irc/irc-recv.c:2854 #, c-format msgid "" "%s: all declared nicknames are already in use, closing connection with " @@ -1511,11 +1511,16 @@ msgstr "" msgid "%s unable to add handler for \"%s\" message (not enough memory)\n" msgstr "" -#: src/gui/curses/gui-display.c:919 -msgid "[not connected] " +#: src/gui/curses/gui-display.c:921 +#, c-format +msgid "%d:[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:927 src/gui/curses/gui-display.c:930 +#: src/gui/curses/gui-display.c:929 +msgid "Act: " +msgstr "" + +#: src/gui/curses/gui-display.c:961 src/gui/curses/gui-display.c:964 msgid "-MORE-" msgstr "" @@ -1528,12 +1533,12 @@ msgstr "" msgid "%s not enough memory for infobar message\n" msgstr "" -#: src/gui/gui-common.c:421 +#: src/gui/gui-common.c:423 #, c-format msgid "%s not enough memory for new line!\n" msgstr "" -#: src/gui/gui-common.c:464 +#: src/gui/gui-common.c:466 msgid "not enough memory!\n" msgstr "" diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c index ccbec9a83..92ff21880 100644 --- a/weechat/src/common/weeconfig.c +++ b/weechat/src/common/weeconfig.c @@ -172,8 +172,8 @@ int cfg_col_chat_dark; int cfg_col_chat_highlight; int cfg_col_chat_bg; int cfg_col_status; -int cfg_col_status_active; int cfg_col_status_data_msg; +int cfg_col_status_data_highlight; int cfg_col_status_data_other; int cfg_col_status_more; int cfg_col_status_bg; @@ -255,14 +255,14 @@ t_config_option weechat_options_colors[] = N_("color for status bar"), OPTION_TYPE_COLOR, 0, 0, 0, "gray", NULL, &cfg_col_status, NULL, &config_change_color }, - { "col_status_active", N_("color for active window"), - N_("color for active window (status bar)"), - OPTION_TYPE_COLOR, 0, 0, 0, - "yellow", NULL, &cfg_col_status_active, NULL, &config_change_color }, { "col_status_data_msg", N_("color for window with new messages"), N_("color for window with new messages (status bar)"), OPTION_TYPE_COLOR, 0, 0, 0, "lightred", NULL, &cfg_col_status_data_msg, NULL, &config_change_color }, + { "col_status_highlight", N_("color for window with highlight"), + N_("color for window with highlight (status bar)"), + OPTION_TYPE_COLOR, 0, 0, 0, + "yellow", NULL, &cfg_col_status_data_highlight, NULL, &config_change_color }, { "col_status_data_other", N_("color for window with new data (not messages)"), N_("color for window with new data (not messages) (status bar)"), OPTION_TYPE_COLOR, 0, 0, 0, diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h index 4cba0be79..692b3690a 100644 --- a/weechat/src/common/weeconfig.h +++ b/weechat/src/common/weeconfig.h @@ -106,8 +106,8 @@ extern int cfg_col_chat_dark; extern int cfg_col_chat_highlight; extern int cfg_col_chat_bg; extern int cfg_col_status; -extern int cfg_col_status_active; extern int cfg_col_status_data_msg; +extern int cfg_col_status_data_highlight; extern int cfg_col_status_data_other; extern int cfg_col_status_more; extern int cfg_col_status_bg; diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index e9ca77e21..5decef5d0 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -35,6 +35,7 @@ #include "../../common/weechat.h" #include "../gui.h" #include "../../common/weeconfig.h" +#include "../../common/hotlist.h" #include "../../irc/irc.h" @@ -788,7 +789,7 @@ void gui_draw_buffer_status (t_gui_buffer *buffer, int erase) { t_gui_window *ptr_win; - t_gui_buffer *ptr_buffer; + t_weechat_hotlist *ptr_hotlist; char format_more[32]; int i, first_mode; @@ -804,120 +805,96 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) wrefresh (ptr_win->win_status); } wmove (ptr_win->win_status, 0, 0); - for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) + if (SERVER(ptr_win->buffer) && SERVER(ptr_win->buffer)->name) { - if (SERVER(ptr_buffer) && !CHANNEL(ptr_buffer)) + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, "[%s] ", SERVER(ptr_win->buffer)->name); + } + if (SERVER(ptr_win->buffer) && !CHANNEL(ptr_win->buffer)) + { + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + if (SERVER(ptr_win->buffer)->is_connected) + wprintw (ptr_win->win_status, "%d:[%s] ", + ptr_win->buffer->number, SERVER(ptr_win->buffer)->name); + else + wprintw (ptr_win->win_status, "%d:(%s) ", + ptr_win->buffer->number, SERVER(ptr_win->buffer)->name); + } + if (SERVER(ptr_win->buffer) && CHANNEL(ptr_win->buffer)) + { + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, "%d:%s", + ptr_win->buffer->number, + CHANNEL(ptr_win->buffer)->name); + if (ptr_win->buffer == CHANNEL(ptr_win->buffer)->buffer) { - if (ptr_win->buffer == SERVER(ptr_buffer)->buffer) + /* display channel modes */ + wprintw (ptr_win->win_status, "("); + i = 0; + first_mode = 1; + while (CHANNEL(ptr_win->buffer)->modes[i]) { - if (ptr_buffer->unread_data) + if (CHANNEL(ptr_win->buffer)->modes[i] != ' ') { - if (ptr_buffer->unread_data > 1) - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_MSG); - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_OTHER); - } - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_ACTIVE); - } - else - { - if (SERVER(ptr_buffer)->buffer && - ((SERVER(ptr_buffer)->buffer)->unread_data)) - { - if (SERVER(ptr_buffer)->buffer->unread_data > 1) - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_MSG); - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_OTHER); - } - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS); - } - if (SERVER(ptr_buffer)->is_connected) - wprintw (ptr_win->win_status, "%d:[%s] ", - ptr_buffer->number, SERVER(ptr_buffer)->name); - else - wprintw (ptr_win->win_status, "%d:(%s) ", - ptr_buffer->number, SERVER(ptr_buffer)->name); - } - if (SERVER(ptr_buffer) && CHANNEL(ptr_buffer)) - { - if (ptr_win->buffer == CHANNEL(ptr_buffer)->buffer) - { - if ((CHANNEL(ptr_buffer)->buffer) && - (CHANNEL(ptr_buffer)->buffer->unread_data)) - { - if (CHANNEL(ptr_buffer)->buffer->unread_data > 1) - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_MSG); - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_OTHER); - } - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_ACTIVE); - } - else - { - if ((CHANNEL(ptr_buffer)->buffer) && - (CHANNEL(ptr_buffer)->buffer->unread_data)) - { - if (CHANNEL(ptr_buffer)->buffer->unread_data > 1) - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_MSG); - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS_DATA_OTHER); - } - else - gui_window_set_color (ptr_win->win_status, - COLOR_WIN_STATUS); - } - wprintw (ptr_win->win_status, "%d:%s", - ptr_buffer->number, - CHANNEL(ptr_buffer)->name); - if (ptr_win->buffer == CHANNEL(ptr_buffer)->buffer) - { - /* display channel modes */ - wprintw (ptr_win->win_status, "("); - i = 0; - first_mode = 1; - while (CHANNEL(ptr_buffer)->modes[i]) - { - if (CHANNEL(ptr_buffer)->modes[i] != ' ') + if (first_mode) { - if (first_mode) - { - wprintw (ptr_win->win_status, "+"); - first_mode = 0; - } - wprintw (ptr_win->win_status, "%c", - CHANNEL(ptr_buffer)->modes[i]); + wprintw (ptr_win->win_status, "+"); + first_mode = 0; } - i++; + wprintw (ptr_win->win_status, "%c", + CHANNEL(ptr_win->buffer)->modes[i]); } - if (CHANNEL(ptr_buffer)->modes[CHANNEL_MODE_KEY] != ' ') - wprintw (ptr_win->win_status, ",%s", - CHANNEL(ptr_buffer)->key); - if (CHANNEL(ptr_buffer)->modes[CHANNEL_MODE_LIMIT] != ' ') - wprintw (ptr_win->win_status, ",%d", - CHANNEL(ptr_buffer)->limit); - wprintw (ptr_win->win_status, ")"); + i++; } - wprintw (ptr_win->win_status, " "); + if (CHANNEL(ptr_win->buffer)->modes[CHANNEL_MODE_KEY] != ' ') + wprintw (ptr_win->win_status, ",%s", + CHANNEL(ptr_win->buffer)->key); + if (CHANNEL(ptr_win->buffer)->modes[CHANNEL_MODE_LIMIT] != ' ') + wprintw (ptr_win->win_status, ",%d", + CHANNEL(ptr_win->buffer)->limit); + wprintw (ptr_win->win_status, ")"); } - if (!SERVER(ptr_buffer)) + wprintw (ptr_win->win_status, " "); + } + if (!SERVER(ptr_win->buffer)) + { + gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, _("%d:[not connected] "), + ptr_win->buffer->number); + } + + /* display list of other active windows (if any) with numbers */ + if (hotlist) + { + gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS); + wprintw (ptr_win->win_status, _("Act: ")); + for (ptr_hotlist = hotlist; ptr_hotlist; + ptr_hotlist = ptr_hotlist->next_hotlist) { - gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS); - wprintw (ptr_win->win_status, _("%d:[not connected] "), - ptr_buffer->number); + switch (ptr_hotlist->priority) + { + case 0: + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS_DATA_OTHER); + break; + case 1: + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS_DATA_MSG); + break; + case 2: + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS_DATA_HIGHLIGHT); + break; + } + wprintw (ptr_win->win_status, "%d", + ptr_hotlist->buffer->number); + gui_window_set_color (ptr_win->win_status, + COLOR_WIN_STATUS); + if (ptr_hotlist->next_hotlist) + wprintw (ptr_win->win_status, ","); } } @@ -1239,6 +1216,8 @@ gui_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer) buffer->num_displayed++; buffer->unread_data = 0; + + hotlist_remove_buffer (buffer); } /* @@ -1498,10 +1477,10 @@ gui_init_colors () cfg_col_chat_highlight & A_CHARTEXT, cfg_col_chat_bg); init_pair (COLOR_WIN_STATUS, cfg_col_status & A_CHARTEXT, cfg_col_status_bg); - init_pair (COLOR_WIN_STATUS_ACTIVE, - cfg_col_status_active & A_CHARTEXT, cfg_col_status_bg); init_pair (COLOR_WIN_STATUS_DATA_MSG, cfg_col_status_data_msg & A_CHARTEXT, cfg_col_status_bg); + init_pair (COLOR_WIN_STATUS_DATA_HIGHLIGHT, + cfg_col_status_data_highlight & A_CHARTEXT, cfg_col_status_bg); init_pair (COLOR_WIN_STATUS_DATA_OTHER, cfg_col_status_data_other & A_CHARTEXT, cfg_col_status_bg); init_pair (COLOR_WIN_STATUS_MORE, @@ -1552,8 +1531,8 @@ gui_init_colors () color_attr[COLOR_WIN_CHAT_DARK - 1] = cfg_col_chat_dark & A_BOLD; color_attr[COLOR_WIN_CHAT_HIGHLIGHT - 1] = cfg_col_chat_highlight & A_BOLD; color_attr[COLOR_WIN_STATUS - 1] = cfg_col_status & A_BOLD; - color_attr[COLOR_WIN_STATUS_ACTIVE - 1] = cfg_col_status_active & A_BOLD; color_attr[COLOR_WIN_STATUS_DATA_MSG - 1] = cfg_col_status_data_msg & A_BOLD; + color_attr[COLOR_WIN_STATUS_DATA_HIGHLIGHT - 1] = cfg_col_status_data_highlight & A_BOLD; color_attr[COLOR_WIN_STATUS_DATA_OTHER - 1] = cfg_col_status_data_other & A_BOLD; color_attr[COLOR_WIN_STATUS_MORE - 1] = cfg_col_status_more & A_BOLD; color_attr[COLOR_WIN_INFOBAR - 1] = cfg_col_infobar & A_BOLD; @@ -1703,6 +1682,7 @@ gui_add_message (t_gui_buffer *buffer, int type, int color, char *message) if (buffer->unread_data < 1 + buffer->last_line->line_with_message) { buffer->unread_data = 1 + buffer->last_line->line_with_message; + hotlist_add (buffer->last_line->line_with_message, buffer); gui_draw_buffer_status (buffer, 1); } } diff --git a/weechat/src/gui/curses/gui-input.c b/weechat/src/gui/curses/gui-input.c index 3e98619a1..179d962d7 100644 --- a/weechat/src/gui/curses/gui-input.c +++ b/weechat/src/gui/curses/gui-input.c @@ -37,6 +37,7 @@ #include "../gui.h" #include "../../common/weeconfig.h" #include "../../common/command.h" +#include "../../common/hotlist.h" #include "../../irc/irc.h" #define KEY_ESCAPE 27 @@ -62,6 +63,16 @@ gui_read_keyb () gui_calculate_pos_size (gui_current_window); gui_redraw_buffer (gui_current_window->buffer); break; + /* inactive function keys */ + case KEY_F(1): + case KEY_F(2): + case KEY_F(3): + case KEY_F(4): + case KEY_F(5): + case KEY_F(9): + case KEY_F(11): + case KEY_F(12): + break; /* previous buffer in window */ case KEY_F(6): gui_switch_to_previous_buffer (gui_current_window); @@ -316,6 +327,26 @@ gui_read_keyb () } } break; + /* Alt-A */ + case 'a': + case 'A': + if (hotlist) + { + if (!hotlist_initial_buffer) + hotlist_initial_buffer = gui_current_window->buffer; + gui_switch_to_buffer (gui_current_window, hotlist->buffer); + gui_redraw_buffer (gui_current_window->buffer); + } + else + { + if (hotlist_initial_buffer) + { + gui_switch_to_buffer (gui_current_window, hotlist_initial_buffer); + gui_redraw_buffer (gui_current_window->buffer); + hotlist_initial_buffer = NULL; + } + } + break; } } break; @@ -341,8 +372,8 @@ gui_read_keyb () break; /* other key => add to input buffer */ default: - /*gui_printf (gui_current_buffer, - "[Debug] key pressed = %d, as octal: %o\n", key, key);*/ + /*gui_printf (gui_current_window->buffer, + "[Debug] key pressed = %d, as octal: %o\n", key, key);*/ new_char[0] = key; new_char[1] = '\0'; gui_buffer_insert_string (gui_current_window->buffer, diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h index 6203e2238..1066d478d 100644 --- a/weechat/src/gui/gui.h +++ b/weechat/src/gui/gui.h @@ -26,38 +26,38 @@ #define INPUT_BUFFER_BLOCK_SIZE 256 -#define NUM_COLORS 38 -#define COLOR_WIN_TITLE 1 -#define COLOR_WIN_CHAT 2 -#define COLOR_WIN_CHAT_TIME 3 -#define COLOR_WIN_CHAT_TIME_SEP 4 -#define COLOR_WIN_CHAT_PREFIX1 5 -#define COLOR_WIN_CHAT_PREFIX2 6 -#define COLOR_WIN_CHAT_NICK 7 -#define COLOR_WIN_CHAT_HOST 8 -#define COLOR_WIN_CHAT_CHANNEL 9 -#define COLOR_WIN_CHAT_DARK 10 -#define COLOR_WIN_CHAT_HIGHLIGHT 11 -#define COLOR_WIN_STATUS 12 -#define COLOR_WIN_STATUS_ACTIVE 13 -#define COLOR_WIN_STATUS_DATA_MSG 14 -#define COLOR_WIN_STATUS_DATA_OTHER 15 -#define COLOR_WIN_STATUS_MORE 16 -#define COLOR_WIN_INFOBAR 17 -#define COLOR_WIN_INFOBAR_HIGHLIGHT 18 -#define COLOR_WIN_INPUT 19 -#define COLOR_WIN_INPUT_CHANNEL 20 -#define COLOR_WIN_INPUT_NICK 21 -#define COLOR_WIN_NICK 22 -#define COLOR_WIN_NICK_OP 23 -#define COLOR_WIN_NICK_HALFOP 24 -#define COLOR_WIN_NICK_VOICE 25 -#define COLOR_WIN_NICK_SEP 26 -#define COLOR_WIN_NICK_SELF 27 -#define COLOR_WIN_NICK_PRIVATE 28 -#define COLOR_WIN_NICK_FIRST 29 -#define COLOR_WIN_NICK_LAST 38 -#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1) +#define NUM_COLORS 38 +#define COLOR_WIN_TITLE 1 +#define COLOR_WIN_CHAT 2 +#define COLOR_WIN_CHAT_TIME 3 +#define COLOR_WIN_CHAT_TIME_SEP 4 +#define COLOR_WIN_CHAT_PREFIX1 5 +#define COLOR_WIN_CHAT_PREFIX2 6 +#define COLOR_WIN_CHAT_NICK 7 +#define COLOR_WIN_CHAT_HOST 8 +#define COLOR_WIN_CHAT_CHANNEL 9 +#define COLOR_WIN_CHAT_DARK 10 +#define COLOR_WIN_CHAT_HIGHLIGHT 11 +#define COLOR_WIN_STATUS 12 +#define COLOR_WIN_STATUS_DATA_MSG 13 +#define COLOR_WIN_STATUS_DATA_HIGHLIGHT 14 +#define COLOR_WIN_STATUS_DATA_OTHER 15 +#define COLOR_WIN_STATUS_MORE 16 +#define COLOR_WIN_INFOBAR 17 +#define COLOR_WIN_INFOBAR_HIGHLIGHT 18 +#define COLOR_WIN_INPUT 19 +#define COLOR_WIN_INPUT_CHANNEL 20 +#define COLOR_WIN_INPUT_NICK 21 +#define COLOR_WIN_NICK 22 +#define COLOR_WIN_NICK_OP 23 +#define COLOR_WIN_NICK_HALFOP 24 +#define COLOR_WIN_NICK_VOICE 25 +#define COLOR_WIN_NICK_SEP 26 +#define COLOR_WIN_NICK_SELF 27 +#define COLOR_WIN_NICK_PRIVATE 28 +#define COLOR_WIN_NICK_FIRST 29 +#define COLOR_WIN_NICK_LAST 38 +#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1) #define SERVER(buffer) ((t_irc_server *)(buffer->server)) #define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel)) diff --git a/weechat/src/irc/irc-nick.c b/weechat/src/irc/irc-nick.c index 3c90c4ef6..e2e0e578c 100644 --- a/weechat/src/irc/irc-nick.c +++ b/weechat/src/irc/irc-nick.c @@ -37,12 +37,12 @@ */ int -nick_find_color (t_irc_channel *channel, t_irc_nick *nick) +nick_find_color (t_irc_nick *nick) { int i, color; color = 0; - for (i = 0; i < strlen(nick->nick); i++) + for (i = strlen (nick->nick) - 1; i >= 0; i--) { color += (int)(nick->nick[i]); } @@ -179,7 +179,7 @@ nick_new (t_irc_channel *channel, char *nick_name, if (strcasecmp (new_nick->nick, SERVER(channel->buffer)->nick) == 0) new_nick->color = COLOR_WIN_NICK_SELF; else - new_nick->color = nick_find_color (channel, new_nick); + new_nick->color = nick_find_color (new_nick); nick_insert_sorted (channel, new_nick); @@ -222,7 +222,7 @@ nick_change (t_irc_channel *channel, t_irc_nick *nick, char *new_nick) if (strcasecmp (nick->nick, SERVER(channel->buffer)->nick) == 0) nick->color = COLOR_WIN_NICK_SELF; else - nick->color = nick_find_color (channel, nick); + nick->color = nick_find_color (nick); /* insert again nick into sorted list */ nick_resort (channel, nick);