diff options
45 files changed, 267 insertions, 1505 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 009f18c9d..e28a18992 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -32,7 +32,6 @@ ./src/gui/curses/gui-curses-chat.c ./src/gui/curses/gui-curses-color.c ./src/gui/curses/gui-curses.h -./src/gui/curses/gui-curses-infobar.c ./src/gui/curses/gui-curses-input.c ./src/gui/curses/gui-curses-keyboard.c ./src/gui/curses/gui-curses-main.c @@ -43,7 +42,6 @@ ./src/gui/gtk/gui-gtk-chat.c ./src/gui/gtk/gui-gtk-color.c ./src/gui/gtk/gui-gtk.h -./src/gui/gtk/gui-gtk-infobar.c ./src/gui/gtk/gui-gtk-input.c ./src/gui/gtk/gui-gtk-keyboard.c ./src/gui/gtk/gui-gtk-main.c @@ -68,8 +66,6 @@ ./src/gui/gui-history.h ./src/gui/gui-hotlist.c ./src/gui/gui-hotlist.h -./src/gui/gui-infobar.c -./src/gui/gui-infobar.h ./src/gui/gui-input.c ./src/gui/gui-input.h ./src/gui/gui-keyboard.c @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-06-18 16:02+0200\n" +"POT-Creation-Date: 2008-06-21 11:30+0200\n" "PO-Revision-Date: 2007-09-06 12:44+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -997,23 +997,6 @@ msgstr "" "[skupina_číslo_vzestupně], group_number_desc [skupina_číslo_sestupně], " "number_asc [číslo_vzestupně], number_desc [číslo_sestupně] ) " -msgid "enable info bar" -msgstr "povolit info bar" - -msgid "" -"delay (in seconds) for highlight messages in infobar (0 = disable highlight " -"notifications in infobar)" -msgstr "" -"podržet (v sekundách) zvýrazněnou zprávu v infobaru (0 = zakázat zvýrazněnou " -"notifikaci v infobaru)" - -msgid "display seconds in infobar time" -msgstr "zobrazit sekundy v čase v infobaru" - -#, fuzzy -msgid "time format for time in infobar" -msgstr "časová značka pro čas v infobaru" - #, c-format msgid "" "format for input prompt ('%c' is replaced by channel or server, '%n' by nick " @@ -1302,22 +1285,6 @@ msgid "text color for buffer with new data (status bar)" msgstr "barva okna s novými daty (status bar)" #, fuzzy -msgid "text color for infobar" -msgstr "barva textu v info baru" - -#, fuzzy -msgid "background color for infobar" -msgstr "barva textu v info baru" - -#, fuzzy -msgid "text color for infobar delimiters" -msgstr "barva děličů v infobaru" - -#, fuzzy -msgid "text color for infobar highlight notification" -msgstr "barva upozornění zvýraznění v info baru" - -#, fuzzy msgid "text color for input line" msgstr "barva pro vstupní text" @@ -1748,10 +1715,6 @@ msgstr "Nedostatek paměti pro nový řádek\n" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s nemohu přidat buffer do hotlistu\n" -#, fuzzy -msgid "Error: not enough memory for infobar message" -msgstr "%s nedostatek paměti pro infobar zprávu\n" - #, fuzzy, c-format msgid "Error: unable to bind key \"%s\"" msgstr "%s nemohu napojit kalávesu \"%s\"\n" @@ -1923,10 +1886,6 @@ msgstr "" msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4" msgstr "" -#, fuzzy -msgid "test message in infobar" -msgstr "vyčisti infobar" - #, fuzzy, c-format msgid "%s%s: missing argument for \"%s\" command (try /help %s)" msgstr "%s chybí argumenty pro příkaz \"%s\"\n" @@ -1960,10 +1919,6 @@ msgid "text: write this text" msgstr "časová značka pro čas v infobaru" #, fuzzy -msgid "print a message in infobar for 10 seconds" -msgstr "vyčisti infobar" - -#, fuzzy msgid "open a new buffer" msgstr "nemohu vytvořit nový buffer" @@ -4600,6 +4555,51 @@ msgstr "%s DCC: nemohu nastavit 'neblokovaci' volbu na soket\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s chybí argument pro volbu \"%s\"\n" +#~ msgid "enable info bar" +#~ msgstr "povolit info bar" + +#~ msgid "" +#~ "delay (in seconds) for highlight messages in infobar (0 = disable " +#~ "highlight notifications in infobar)" +#~ msgstr "" +#~ "podržet (v sekundách) zvýrazněnou zprávu v infobaru (0 = zakázat " +#~ "zvýrazněnou notifikaci v infobaru)" + +#~ msgid "display seconds in infobar time" +#~ msgstr "zobrazit sekundy v čase v infobaru" + +#, fuzzy +#~ msgid "time format for time in infobar" +#~ msgstr "časová značka pro čas v infobaru" + +#, fuzzy +#~ msgid "text color for infobar" +#~ msgstr "barva textu v info baru" + +#, fuzzy +#~ msgid "background color for infobar" +#~ msgstr "barva textu v info baru" + +#, fuzzy +#~ msgid "text color for infobar delimiters" +#~ msgstr "barva děličů v infobaru" + +#, fuzzy +#~ msgid "text color for infobar highlight notification" +#~ msgstr "barva upozornění zvýraznění v info baru" + +#, fuzzy +#~ msgid "Error: not enough memory for infobar message" +#~ msgstr "%s nedostatek paměti pro infobar zprávu\n" + +#, fuzzy +#~ msgid "test message in infobar" +#~ msgstr "vyčisti infobar" + +#, fuzzy +#~ msgid "print a message in infobar for 10 seconds" +#~ msgstr "vyčisti infobar" + #~ msgid "" #~ "comma separated list of notify levels for channels of this server " #~ "(format: #channel:1,..), a channel name '*' is reserved for server " @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-06-18 16:02+0200\n" +"POT-Creation-Date: 2008-06-21 11:30+0200\n" "PO-Revision-Date: 2007-09-06 12:44+0200\n" "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -990,23 +990,6 @@ msgid "" "group_number_asc, group_number_desc, number_asc, number_desc)" msgstr "" -msgid "enable info bar" -msgstr "Infoleiste aktivieren" - -msgid "" -"delay (in seconds) for highlight messages in infobar (0 = disable highlight " -"notifications in infobar)" -msgstr "" -"Anzeigezeit in Sekunden für Highlight-Messages in der Infobar (0: gar nicht " -"erst anzeigen)" - -msgid "display seconds in infobar time" -msgstr "Sekunden in der Infobar-Zeit anzeigen" - -#, fuzzy -msgid "time format for time in infobar" -msgstr "Timestamp in der Infobar" - #, c-format msgid "" "format for input prompt ('%c' is replaced by channel or server, '%n' by nick " @@ -1297,22 +1280,6 @@ msgid "text color for buffer with new data (status bar)" msgstr "Farbe eines Fensters mit neuen Daten in der Statuszeile" #, fuzzy -msgid "text color for infobar" -msgstr "Farbe des Infobar-Textes" - -#, fuzzy -msgid "background color for infobar" -msgstr "Farbe des Infobar-Textes" - -#, fuzzy -msgid "text color for infobar delimiters" -msgstr "Farbe der Infobar-Trennzeichen" - -#, fuzzy -msgid "text color for infobar highlight notification" -msgstr "Farbe der Infobar-Highlight-Notifikation" - -#, fuzzy msgid "text color for input line" msgstr "Farbe der Eingabezeile" @@ -1750,10 +1717,6 @@ msgstr "Nicht genügend Speicher für neue Zeile\n" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s Puffer kann nicht zur Hotlist hinzugefügt werden\n" -#, fuzzy -msgid "Error: not enough memory for infobar message" -msgstr "%s nicht genügend Speicher für Infobar-Nachricht\n" - #, fuzzy, c-format msgid "Error: unable to bind key \"%s\"" msgstr "%s kann die Taste \"%s\" nicht zuordnen\n" @@ -1924,10 +1887,6 @@ msgstr "" msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4" msgstr "" -#, fuzzy -msgid "test message in infobar" -msgstr "Infobar leeren" - #, fuzzy, c-format msgid "%s%s: missing argument for \"%s\" command (try /help %s)" msgstr "%s fehlende Argumente für den \"%s\"-Befehl\n" @@ -1961,10 +1920,6 @@ msgid "text: write this text" msgstr "Timestamp in der Infobar" #, fuzzy -msgid "print a message in infobar for 10 seconds" -msgstr "Infobar leeren" - -#, fuzzy msgid "open a new buffer" msgstr "kann keinen neuen Puffer erstellen" @@ -4590,6 +4545,51 @@ msgstr "%s DCC: kann die 'nonblock'-Option für den Socket nicht festlegen\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s fehlende Argumente für die \"--dir\"-Option\n" +#~ msgid "enable info bar" +#~ msgstr "Infoleiste aktivieren" + +#~ msgid "" +#~ "delay (in seconds) for highlight messages in infobar (0 = disable " +#~ "highlight notifications in infobar)" +#~ msgstr "" +#~ "Anzeigezeit in Sekunden für Highlight-Messages in der Infobar (0: gar " +#~ "nicht erst anzeigen)" + +#~ msgid "display seconds in infobar time" +#~ msgstr "Sekunden in der Infobar-Zeit anzeigen" + +#, fuzzy +#~ msgid "time format for time in infobar" +#~ msgstr "Timestamp in der Infobar" + +#, fuzzy +#~ msgid "text color for infobar" +#~ msgstr "Farbe des Infobar-Textes" + +#, fuzzy +#~ msgid "background color for infobar" +#~ msgstr "Farbe des Infobar-Textes" + +#, fuzzy +#~ msgid "text color for infobar delimiters" +#~ msgstr "Farbe der Infobar-Trennzeichen" + +#, fuzzy +#~ msgid "text color for infobar highlight notification" +#~ msgstr "Farbe der Infobar-Highlight-Notifikation" + +#, fuzzy +#~ msgid "Error: not enough memory for infobar message" +#~ msgstr "%s nicht genügend Speicher für Infobar-Nachricht\n" + +#, fuzzy +#~ msgid "test message in infobar" +#~ msgstr "Infobar leeren" + +#, fuzzy +#~ msgid "print a message in infobar for 10 seconds" +#~ msgstr "Infobar leeren" + #~ msgid "" #~ "comma separated list of notify levels for channels of this server " #~ "(format: #channel:1,..), a channel name '*' is reserved for server " @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-06-18 16:02+0200\n" +"POT-Creation-Date: 2008-06-21 11:30+0200\n" "PO-Revision-Date: 2007-09-19 12:09+0200\n" "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -969,23 +969,6 @@ msgid "" "group_number_asc, group_number_desc, number_asc, number_desc)" msgstr "" -msgid "enable info bar" -msgstr "activa la barra de información" - -msgid "" -"delay (in seconds) for highlight messages in infobar (0 = disable highlight " -"notifications in infobar)" -msgstr "" -"retraso (en segundos) para la notificación de mensajes en la barra de " -"información (0 = desactivar las notificaciones en la barra de información)" - -msgid "display seconds in infobar time" -msgstr "mostrar segundos en la hora de la barra de herramientas" - -#, fuzzy -msgid "time format for time in infobar" -msgstr "fecha y hora para las conversaciones guardadas" - #, c-format msgid "" "format for input prompt ('%c' is replaced by channel or server, '%n' by nick " @@ -1073,8 +1056,8 @@ msgstr "la cadena mostrada tras la finalización de los nombres de usuario" #, fuzzy msgid "use a marker (line or char) on buffers to show first unread line" msgstr "" -"usar un marcador en los servidores/canales para mostrar la primera lÃnea " -"sin leer" +"usar un marcador en los servidores/canales para mostrar la primera lÃnea sin " +"leer" #, fuzzy msgid "save configuration file on exit" @@ -1282,22 +1265,6 @@ msgid "text color for buffer with new data (status bar)" msgstr "color para una ventana con nuevos datos (barra de estado)" #, fuzzy -msgid "text color for infobar" -msgstr "color para el texto de la barra de información" - -#, fuzzy -msgid "background color for infobar" -msgstr "color para el texto de la barra de información" - -#, fuzzy -msgid "text color for infobar delimiters" -msgstr "color para los delimitadores de la barra de información" - -#, fuzzy -msgid "text color for infobar highlight notification" -msgstr "color para la notificación en la barra de información" - -#, fuzzy msgid "text color for input line" msgstr "color para el texto de entrada" @@ -1604,8 +1571,8 @@ msgid "" "support.\n" "Be careful, private info may be in these files.\n" msgstr "" -"Por favor, envÃa %s/%s, %s/%s y los mensajes de arriba a los " -"desarrolladores de Weechat para el soporte.\n" +"Por favor, envÃa %s/%s, %s/%s y los mensajes de arriba a los desarrolladores " +"de Weechat para el soporte.\n" "Sé cuidadoso, puede que haya información privada en estos ficheros.\n" #, c-format @@ -1733,11 +1700,6 @@ msgstr "No hay suficiente memoria para una nueva lÃnea\n" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s no es posible añadir un búfer a la lista caliente (hotlist)\n" -#, fuzzy -msgid "Error: not enough memory for infobar message" -msgstr "" -"No hay suficiente memoria para el mensaje de la barra de información\n" - #, fuzzy, c-format msgid "Error: unable to bind key \"%s\"" msgstr "%s No ha sido posible atar la clave \"%s\"\n" @@ -1903,10 +1865,6 @@ msgstr "" msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4" msgstr "" -#, fuzzy -msgid "test message in infobar" -msgstr "limpiar barra de información" - #, fuzzy, c-format msgid "%s%s: missing argument for \"%s\" command (try /help %s)" msgstr "%s faltan argumentos para el comando \"%s\"\n" @@ -1940,10 +1898,6 @@ msgid "text: write this text" msgstr "fecha y hora para las conversaciones guardadas" #, fuzzy -msgid "print a message in infobar for 10 seconds" -msgstr "limpiar barra de información" - -#, fuzzy msgid "open a new buffer" msgstr "no se puede crear un nuevo búfer" @@ -4599,6 +4553,53 @@ msgstr "%s no es posible crear el servidor\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s falta un argumento para la opción --dir\n" +#~ msgid "enable info bar" +#~ msgstr "activa la barra de información" + +#~ msgid "" +#~ "delay (in seconds) for highlight messages in infobar (0 = disable " +#~ "highlight notifications in infobar)" +#~ msgstr "" +#~ "retraso (en segundos) para la notificación de mensajes en la barra de " +#~ "información (0 = desactivar las notificaciones en la barra de " +#~ "información)" + +#~ msgid "display seconds in infobar time" +#~ msgstr "mostrar segundos en la hora de la barra de herramientas" + +#, fuzzy +#~ msgid "time format for time in infobar" +#~ msgstr "fecha y hora para las conversaciones guardadas" + +#, fuzzy +#~ msgid "text color for infobar" +#~ msgstr "color para el texto de la barra de información" + +#, fuzzy +#~ msgid "background color for infobar" +#~ msgstr "color para el texto de la barra de información" + +#, fuzzy +#~ msgid "text color for infobar delimiters" +#~ msgstr "color para los delimitadores de la barra de información" + +#, fuzzy +#~ msgid "text color for infobar highlight notification" +#~ msgstr "color para la notificación en la barra de información" + +#, fuzzy +#~ msgid "Error: not enough memory for infobar message" +#~ msgstr "" +#~ "No hay suficiente memoria para el mensaje de la barra de información\n" + +#, fuzzy +#~ msgid "test message in infobar" +#~ msgstr "limpiar barra de información" + +#, fuzzy +#~ msgid "print a message in infobar for 10 seconds" +#~ msgstr "limpiar barra de información" + #, fuzzy #~ msgid "" #~ "comma separated list of notify levels for channels of this server " @@ -5443,8 +5444,8 @@ msgstr "%s falta un argumento para la opción --dir\n" #~ "maximum number of lines in history for one server/channel/private window " #~ "(0 = unlimited)" #~ msgstr "" -#~ "número máximo de lÃneas en el histórico para un servidor/canal/" -#~ "privado (0 = ilimitado)" +#~ "número máximo de lÃneas en el histórico para un servidor/canal/privado " +#~ "(0 = ilimitado)" #, fuzzy #~ msgid "log messages from plugins" @@ -5638,8 +5639,8 @@ msgstr "%s falta un argumento para la opción --dir\n" #~ "max size for aligning nick and other messages (should be >= to " #~ "look_align_size)" #~ msgstr "" -#~ "tamaño máximo para la alineación de nick y otros mensajes (deberÃa " -#~ "ser >= a look_align_size)" +#~ "tamaño máximo para la alineación de nick y otros mensajes (deberÃa ser " +#~ ">= a look_align_size)" #~ msgid "server name not found" #~ msgstr "nombre de servidor no encontrado" @@ -6426,8 +6427,7 @@ msgstr "%s falta un argumento para la opción --dir\n" #~ msgid "color for chan owner symbol (specific to unrealircd)" #~ msgstr "" -#~ "color para el sÃmbolo de propietario de canal (especificado en " -#~ "unrealircd)" +#~ "color para el sÃmbolo de propietario de canal (especificado en unrealircd)" #~ msgid "color for chan admin symbol" #~ msgstr "color para el sÃmbolo de administrador de canal" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-06-18 16:02+0200\n" -"PO-Revision-Date: 2008-06-18 16:02+0200\n" +"POT-Creation-Date: 2008-06-21 11:30+0200\n" +"PO-Revision-Date: 2008-06-21 11:30+0200\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1006,22 +1006,6 @@ msgstr "" "group_time_desc, group_number_asc, group_number_desc, number_asc, " "number_desc)" -msgid "enable info bar" -msgstr "active la barre d'infos" - -msgid "" -"delay (in seconds) for highlight messages in infobar (0 = disable highlight " -"notifications in infobar)" -msgstr "" -"délai (en secondes) pour la notification des messages dans la barre d'infos " -"(0 = désactiver les notifications dans la barre d'infos)" - -msgid "display seconds in infobar time" -msgstr "afficher les secondes pour l'heure dans la barre d'infos" - -msgid "time format for time in infobar" -msgstr "format de date/heure dans la barre d'infos" - #, c-format msgid "" "format for input prompt ('%c' is replaced by channel or server, '%n' by nick " @@ -1264,18 +1248,6 @@ msgid "text color for buffer with new data (status bar)" msgstr "" "couleur du texte pour un tampon avec des nouvelles données (barre de statut)" -msgid "text color for infobar" -msgstr "couleur du texte pour la barre d'infos" - -msgid "background color for infobar" -msgstr "couleur du fond pour la barre d'infos" - -msgid "text color for infobar delimiters" -msgstr "couleur du texte pour les délimiteurs de la barre d'infos" - -msgid "text color for infobar highlight notification" -msgstr "couleur du texte pour la notification dans la barre d'infos" - msgid "text color for input line" msgstr "couleur du texte pour la ligne de saisie" @@ -1700,9 +1672,6 @@ msgstr "Pas assez de mémoire pour une nouvelle ligne" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "Erreur: impossible d'ajouter le tampon à la liste des tampons actifs" -msgid "Error: not enough memory for infobar message" -msgstr "Erreur: pas assez de mémoire pour un message de la barre d'infos" - #, c-format msgid "Error: unable to bind key \"%s\"" msgstr "Erreur: impossible de créer la touche \"%s\"" @@ -1872,9 +1841,6 @@ msgstr "%smessage de démonstration avec préfixe d'erreur" msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4" msgstr "couleurs: %s tampon %s pseudo1 %s pseudo2 %s pseudo3 %s pseudo4" -msgid "test message in infobar" -msgstr "message de test dans la barre d'infos" - #, c-format msgid "%s%s: missing argument for \"%s\" command (try /help %s)" msgstr "%s%s: paramètre manquant pour la commande \"%s\" (essayez /help %s)" @@ -1906,9 +1872,6 @@ msgstr "[texte]" msgid "text: write this text" msgstr "texte: affiche ce texte" -msgid "print a message in infobar for 10 seconds" -msgstr "affiche un message dans la barre d'infos pendant 10 secondes" - msgid "open a new buffer" msgstr "ouvrir un nouveau tampon" @@ -4555,12 +4518,3 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s" - -#~ msgid "" -#~ "comma separated list of notify levels for channels of this server " -#~ "(format: #channel:1,..), a channel name '*' is reserved for server " -#~ "default notify level" -#~ msgstr "" -#~ "liste des niveaux de notifications (séparés par des virgules) pour les " -#~ "canaux de ce serveur (format: #canal:1,..), un nom de canal '*' est " -#~ "réservé pour la notification par défaut du serveur" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-06-18 16:02+0200\n" +"POT-Creation-Date: 2008-06-21 11:30+0200\n" "PO-Revision-Date: 2007-10-10 18:07+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -998,23 +998,6 @@ msgid "" "group_number_asc, group_number_desc, number_asc, number_desc)" msgstr "" -msgid "enable info bar" -msgstr "információs pult engedélyezése" - -msgid "" -"delay (in seconds) for highlight messages in infobar (0 = disable highlight " -"notifications in infobar)" -msgstr "" -"kihagyás (másodpercben) az üzenetek kiemelésére az információs pulton (0 = " -"kiemelt üzenetek tiltása az információs pulton)" - -msgid "display seconds in infobar time" -msgstr "másodpercek mutatása az információs pulton" - -#, fuzzy -msgid "time format for time in infobar" -msgstr "időbélyeg a információs pult idejéhez" - #, c-format msgid "" "format for input prompt ('%c' is replaced by channel or server, '%n' by nick " @@ -1305,22 +1288,6 @@ msgid "text color for buffer with new data (status bar)" msgstr "új adatot tartalmazó ablak színe (státuszsor)" #, fuzzy -msgid "text color for infobar" -msgstr "információs pult szövegének színe" - -#, fuzzy -msgid "background color for infobar" -msgstr "információs pult szövegének színe" - -#, fuzzy -msgid "text color for infobar delimiters" -msgstr "információs pult határolóinak színe" - -#, fuzzy -msgid "text color for infobar highlight notification" -msgstr "információs pulton megjelenő kiemelések színe" - -#, fuzzy msgid "text color for input line" msgstr "szövegbeviteli mező színe" @@ -1752,10 +1719,6 @@ msgstr "Nincs elég memória az új sorhoz\n" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s nincs elég memória az ignore elkészítéséhez\n" -#, fuzzy -msgid "Error: not enough memory for infobar message" -msgstr "%s nincs elég memória az információs pult üzenethez\n" - #, fuzzy, c-format msgid "Error: unable to bind key \"%s\"" msgstr "%s nem sikerült a(z) \"%s\" billentyűt hozzárendelni\n" @@ -1928,10 +1891,6 @@ msgstr "" msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4" msgstr "" -#, fuzzy -msgid "test message in infobar" -msgstr "információs pult törlése" - #, fuzzy, c-format msgid "%s%s: missing argument for \"%s\" command (try /help %s)" msgstr "%s hiányzó argumentum a \"%s\" parancsnak\n" @@ -1965,10 +1924,6 @@ msgid "text: write this text" msgstr "időbélyeg a információs pult idejéhez" #, fuzzy -msgid "print a message in infobar for 10 seconds" -msgstr "információs pult törlése" - -#, fuzzy msgid "open a new buffer" msgstr "nem sikerült új puffert nyitni" @@ -4606,6 +4561,51 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" +#~ msgid "enable info bar" +#~ msgstr "információs pult engedélyezése" + +#~ msgid "" +#~ "delay (in seconds) for highlight messages in infobar (0 = disable " +#~ "highlight notifications in infobar)" +#~ msgstr "" +#~ "kihagyás (másodpercben) az üzenetek kiemelésére az információs pulton (0 " +#~ "= kiemelt üzenetek tiltása az információs pulton)" + +#~ msgid "display seconds in infobar time" +#~ msgstr "másodpercek mutatása az információs pulton" + +#, fuzzy +#~ msgid "time format for time in infobar" +#~ msgstr "időbélyeg a információs pult idejéhez" + +#, fuzzy +#~ msgid "text color for infobar" +#~ msgstr "információs pult szövegének színe" + +#, fuzzy +#~ msgid "background color for infobar" +#~ msgstr "információs pult szövegének színe" + +#, fuzzy +#~ msgid "text color for infobar delimiters" +#~ msgstr "információs pult határolóinak színe" + +#, fuzzy +#~ msgid "text color for infobar highlight notification" +#~ msgstr "információs pulton megjelenő kiemelések színe" + +#, fuzzy +#~ msgid "Error: not enough memory for infobar message" +#~ msgstr "%s nincs elég memória az információs pult üzenethez\n" + +#, fuzzy +#~ msgid "test message in infobar" +#~ msgstr "információs pult törlése" + +#, fuzzy +#~ msgid "print a message in infobar for 10 seconds" +#~ msgstr "információs pult törlése" + #~ msgid "" #~ "comma separated list of notify levels for channels of this server " #~ "(format: #channel:1,..), a channel name '*' is reserved for server " @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-06-18 16:02+0200\n" +"POT-Creation-Date: 2008-06-21 11:30+0200\n" "PO-Revision-Date: 2007-09-06 12:44+0200\n" "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -999,23 +999,6 @@ msgstr "" "тип сортировки хотлиста (group_time_asc (по-умолчанию), group_time_desc, " "group_number_asc, group_number_desc, number_asc, number_desc)" -msgid "enable info bar" -msgstr "включить информационную панель" - -msgid "" -"delay (in seconds) for highlight messages in infobar (0 = disable highlight " -"notifications in infobar)" -msgstr "" -"задержка (в секундах) отображения сообщений в информационной строке (0 = " -"отключить уведомления в информационной строке)" - -msgid "display seconds in infobar time" -msgstr "показывать секунды в часах информационной панели" - -#, fuzzy -msgid "time format for time in infobar" -msgstr "время в информационной строке" - #, c-format msgid "" "format for input prompt ('%c' is replaced by channel or server, '%n' by nick " @@ -1308,22 +1291,6 @@ msgid "text color for buffer with new data (status bar)" msgstr "цвет окна с новыми данными (в строке состояния)" #, fuzzy -msgid "text color for infobar" -msgstr "цвет текста информационной панели" - -#, fuzzy -msgid "background color for infobar" -msgstr "цвет текста информационной панели" - -#, fuzzy -msgid "text color for infobar delimiters" -msgstr "цвет разделителей информационной панели" - -#, fuzzy -msgid "text color for infobar highlight notification" -msgstr "цвет оповещения в информационной панели" - -#, fuzzy msgid "text color for input line" msgstr "цвет вводимого текста" @@ -1757,10 +1724,6 @@ msgstr "Недостаточно памяти для новой строчки\n msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s не могу добавить буфер в хотлист\n" -#, fuzzy -msgid "Error: not enough memory for infobar message" -msgstr "%s недостаточно памяти для сообщения в строке информации\n" - #, fuzzy, c-format msgid "Error: unable to bind key \"%s\"" msgstr "%s не могу установить клавишу \"%s\"\n" @@ -1933,10 +1896,6 @@ msgstr "" msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4" msgstr "" -#, fuzzy -msgid "test message in infobar" -msgstr "очистить информационную панель" - #, fuzzy, c-format msgid "%s%s: missing argument for \"%s\" command (try /help %s)" msgstr "%s нет аргументов для \"%s\" команды\n" @@ -1970,10 +1929,6 @@ msgid "text: write this text" msgstr "время в информационной строке" #, fuzzy -msgid "print a message in infobar for 10 seconds" -msgstr "очистить информационную панель" - -#, fuzzy msgid "open a new buffer" msgstr "невозможно создать новый буфер" @@ -4589,6 +4544,51 @@ msgstr "%s DCC: не могу установить неблокирующий р msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s нет аргумента для параметра \"%s\"\n" +#~ msgid "enable info bar" +#~ msgstr "включить информационную панель" + +#~ msgid "" +#~ "delay (in seconds) for highlight messages in infobar (0 = disable " +#~ "highlight notifications in infobar)" +#~ msgstr "" +#~ "задержка (в секундах) отображения сообщений в информационной строке (0 = " +#~ "отключить уведомления в информационной строке)" + +#~ msgid "display seconds in infobar time" +#~ msgstr "показывать секунды в часах информационной панели" + +#, fuzzy +#~ msgid "time format for time in infobar" +#~ msgstr "время в информационной строке" + +#, fuzzy +#~ msgid "text color for infobar" +#~ msgstr "цвет текста информационной панели" + +#, fuzzy +#~ msgid "background color for infobar" +#~ msgstr "цвет текста информационной панели" + +#, fuzzy +#~ msgid "text color for infobar delimiters" +#~ msgstr "цвет разделителей информационной панели" + +#, fuzzy +#~ msgid "text color for infobar highlight notification" +#~ msgstr "цвет оповещения в информационной панели" + +#, fuzzy +#~ msgid "Error: not enough memory for infobar message" +#~ msgstr "%s недостаточно памяти для сообщения в строке информации\n" + +#, fuzzy +#~ msgid "test message in infobar" +#~ msgstr "очистить информационную панель" + +#, fuzzy +#~ msgid "print a message in infobar for 10 seconds" +#~ msgstr "очистить информационную панель" + #~ msgid "" #~ "comma separated list of notify levels for channels of this server " #~ "(format: #channel:1,..), a channel name '*' is reserved for server " diff --git a/po/srcfiles.cmake b/po/srcfiles.cmake index 6891c4e63..30be03af3 100644 --- a/po/srcfiles.cmake +++ b/po/srcfiles.cmake @@ -33,7 +33,6 @@ SET(WEECHAT_SOURCES ./src/gui/curses/gui-curses-chat.c ./src/gui/curses/gui-curses-color.c ./src/gui/curses/gui-curses.h -./src/gui/curses/gui-curses-infobar.c ./src/gui/curses/gui-curses-input.c ./src/gui/curses/gui-curses-keyboard.c ./src/gui/curses/gui-curses-main.c @@ -44,7 +43,6 @@ SET(WEECHAT_SOURCES ./src/gui/gtk/gui-gtk-chat.c ./src/gui/gtk/gui-gtk-color.c ./src/gui/gtk/gui-gtk.h -./src/gui/gtk/gui-gtk-infobar.c ./src/gui/gtk/gui-gtk-input.c ./src/gui/gtk/gui-gtk-keyboard.c ./src/gui/gtk/gui-gtk-main.c @@ -69,8 +67,6 @@ SET(WEECHAT_SOURCES ./src/gui/gui-history.h ./src/gui/gui-hotlist.c ./src/gui/gui-hotlist.h -./src/gui/gui-infobar.c -./src/gui/gui-infobar.h ./src/gui/gui-input.c ./src/gui/gui-input.h ./src/gui/gui-keyboard.c diff --git a/po/weechat.pot b/po/weechat.pot index 4734a1ce5..943676e88 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: 2008-06-18 16:02+0200\n" +"POT-Creation-Date: 2008-06-21 11:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -826,20 +826,6 @@ msgid "" "group_number_asc, group_number_desc, number_asc, number_desc)" msgstr "" -msgid "enable info bar" -msgstr "" - -msgid "" -"delay (in seconds) for highlight messages in infobar (0 = disable highlight " -"notifications in infobar)" -msgstr "" - -msgid "display seconds in infobar time" -msgstr "" - -msgid "time format for time in infobar" -msgstr "" - #, c-format msgid "" "format for input prompt ('%c' is replaced by channel or server, '%n' by nick " @@ -1058,18 +1044,6 @@ msgstr "" msgid "text color for buffer with new data (status bar)" msgstr "" -msgid "text color for infobar" -msgstr "" - -msgid "background color for infobar" -msgstr "" - -msgid "text color for infobar delimiters" -msgstr "" - -msgid "text color for infobar highlight notification" -msgstr "" - msgid "text color for input line" msgstr "" @@ -1450,9 +1424,6 @@ msgstr "" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "" -msgid "Error: not enough memory for infobar message" -msgstr "" - #, c-format msgid "Error: unable to bind key \"%s\"" msgstr "" @@ -1602,9 +1573,6 @@ msgstr "" msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4" msgstr "" -msgid "test message in infobar" -msgstr "" - #, c-format msgid "%s%s: missing argument for \"%s\" command (try /help %s)" msgstr "" @@ -1635,9 +1603,6 @@ msgstr "" msgid "text: write this text" msgstr "" -msgid "print a message in infobar for 10 seconds" -msgstr "" - msgid "open a new buffer" msgstr "" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index b355994db..43383043f 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -1127,8 +1127,6 @@ command_input (void *data, struct t_gui_buffer *buffer, gui_input_jump_previous_buffer (); else if (string_strcasecmp (argv[1], "hotlist_clear") == 0) gui_input_hotlist_clear (); - else if (string_strcasecmp (argv[1], "infobar_clear") == 0) - gui_input_infobar_clear (); else if (string_strcasecmp (argv[1], "grab_key") == 0) gui_input_grab_key (); else if (string_strcasecmp (argv[1], "scroll_unread") == 0) @@ -2658,8 +2656,8 @@ command_init () "move_next_word | history_previous | history_next | " "history_global_previous | history_global_next | " "jump_smart | jump_last_buffer | jump_previous_buffer | " - "hotlist_clear | infobar_clear | grab_key | scroll_unread | " - "set_unread | set_unread_current_buffer | insert [args]", + "hotlist_clear | grab_key | scroll_unread | set_unread | " + "set_unread_current_buffer | insert [args]", _("This command is used by key bindings or plugins."), "return|complete_next|complete_previous|search_next|" "delete_previous_char|delete_next_char|" @@ -2671,8 +2669,8 @@ command_init () "move_next_word|history_previous|history_next|" "history_global_previous|history_global_next|" "jump_smart|jump_last_buffer|jump_previous_buffer|" - "hotlist_clear|infobar_clear|grab_key|scroll_unread|" - "set_unread|set_unread_current_buffer|insert", + "hotlist_clear|grab_key|scroll_unread|set_unread|" + "set_unread_current_buffer|insert", &command_input, NULL); hook_command (NULL, "key", N_("bind/unbind keys"), diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 263800c9c..b5bb04048 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -47,7 +47,6 @@ #include "../gui/gui-color.h" #include "../gui/gui-filter.h" #include "../gui/gui-hotlist.h" -#include "../gui/gui-infobar.h" #include "../gui/gui-keyboard.h" #include "../gui/gui-nicklist.h" #include "../gui/gui-status.h" @@ -79,10 +78,6 @@ struct t_config_option *config_look_hotlist_names_count; struct t_config_option *config_look_hotlist_names_length; struct t_config_option *config_look_hotlist_names_level; struct t_config_option *config_look_hotlist_sort; -struct t_config_option *config_look_infobar; -struct t_config_option *config_look_infobar_delay_highlight; -struct t_config_option *config_look_infobar_seconds; -struct t_config_option *config_look_infobar_time_format; struct t_config_option *config_look_input_format; struct t_config_option *config_look_item_time_format; struct t_config_option *config_look_nicklist; @@ -139,11 +134,6 @@ struct t_config_option *config_color_status_data_private; struct t_config_option *config_color_status_data_highlight; struct t_config_option *config_color_status_data_other; struct t_config_option *config_color_status_more; -struct t_config_option *config_color_infobar; -struct t_config_option *config_color_infobar_bg; -struct t_config_option *config_color_infobar_delimiters; -struct t_config_option *config_color_infobar_highlight; -struct t_config_option *config_color_infobar_bg; struct t_config_option *config_color_input; struct t_config_option *config_color_input_bg; struct t_config_option *config_color_input_server; @@ -380,50 +370,6 @@ config_change_nicks_colors (void *data, struct t_config_option *option) } /* - * config_change_infobar_seconds: called when display of seconds in infobar changed - */ - -void -config_change_infobar_seconds (void *data, struct t_config_option *option) -{ - /* make C compiler happy */ - (void) data; - (void) option; - - int seconds; - - if (gui_infobar_refresh_timer) - unhook (gui_infobar_refresh_timer); - - seconds = (CONFIG_BOOLEAN(config_look_infobar_seconds)) ? 1 : 60; - gui_infobar_refresh_timer = hook_timer (NULL, seconds * 1000, seconds, 0, - gui_infobar_refresh_timer_cb, NULL); - (void) gui_infobar_refresh_timer_cb ("force"); -} - -/* - * config_change_item_time_format: called when time format for time item changed - */ - -void -config_change_item_time_format (void *data, struct t_config_option *option) -{ - /* make C compiler happy */ - (void) data; - (void) option; - - int seconds; - - if (gui_infobar_refresh_timer) - unhook (gui_infobar_refresh_timer); - - seconds = (CONFIG_BOOLEAN(config_look_infobar_seconds)) ? 1 : 60; - gui_infobar_refresh_timer = hook_timer (NULL, seconds * 1000, seconds, 0, - gui_infobar_refresh_timer_cb, NULL); - (void) gui_infobar_refresh_timer_cb ("force"); -} - -/* * config_day_change_timer_cb: timer callback for displaying * "Day changed to xxx" message */ @@ -860,28 +806,6 @@ config_weechat_init () "group_time_asc|group_time_desc|group_number_asc|" "group_number_desc|number_asc|number_desc", 0, 0, "group_time_asc", NULL, NULL, &config_change_hotlist, NULL, NULL, NULL); - config_look_infobar = config_file_new_option ( - weechat_config_file, ptr_section, - "infobar", "boolean", - N_("enable info bar"), - NULL, 0, 0, "on", NULL, NULL, &config_change_buffers, NULL, NULL, NULL); - config_look_infobar_delay_highlight = config_file_new_option ( - weechat_config_file, ptr_section, - "infobar_delay_highlight", "integer", - N_("delay (in seconds) for highlight messages in " - "infobar (0 = disable highlight notifications in " - "infobar)"), - NULL, 0, INT_MAX, "7", NULL, NULL, NULL, NULL, NULL, NULL); - config_look_infobar_seconds = config_file_new_option ( - weechat_config_file, ptr_section, - "infobar_seconds", "boolean", - N_("display seconds in infobar time"), - NULL, 0, 0, "on", NULL, NULL, &config_change_infobar_seconds, NULL, NULL, NULL); - config_look_infobar_time_format = config_file_new_option ( - weechat_config_file, ptr_section, - "infobar_time_format", "string", - N_("time format for time in infobar"), - NULL, 0, 0, "%B, %A %d %Y", NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); config_look_input_format = config_file_new_option ( weechat_config_file, ptr_section, "input_format", "string", @@ -892,7 +816,7 @@ config_weechat_init () weechat_config_file, ptr_section, "item_time_format", "string", N_("time format for \"time\" bar item"), - NULL, 0, 0, "%H:%M", NULL, NULL, &config_change_item_time_format, NULL, NULL, NULL); + NULL, 0, 0, "%H:%M", NULL, NULL, NULL, NULL, NULL, NULL); config_look_nicklist = config_file_new_option ( weechat_config_file, ptr_section, "nicklist", "boolean", @@ -1306,31 +1230,6 @@ config_weechat_init () N_("text color for buffer with new data (status bar)"), NULL, GUI_COLOR_STATUS_MORE, 0, "yellow", NULL, NULL, &config_change_color, NULL, NULL, NULL); - /* infobar window */ - config_color_infobar = config_file_new_option ( - weechat_config_file, ptr_section, - "infobar", "color", - N_("text color for infobar"), - NULL, GUI_COLOR_INFOBAR, 0, "black", - NULL, NULL, &config_change_color, NULL, NULL, NULL); - config_color_infobar_bg = config_file_new_option ( - weechat_config_file, ptr_section, - "infobar_bg", "color", - N_("background color for infobar"), - NULL, -1, 0, "cyan", - NULL, NULL, &config_change_color, NULL, NULL, NULL); - config_color_infobar_delimiters = config_file_new_option ( - weechat_config_file, ptr_section, - "infobar_delimiters", "color", - N_("text color for infobar delimiters"), - NULL, GUI_COLOR_INFOBAR_DELIMITERS, 0, "blue", - NULL, NULL, &config_change_color, NULL, NULL, NULL); - config_color_infobar_highlight = config_file_new_option ( - weechat_config_file, ptr_section, - "infobar_highlight", "color", - N_("text color for infobar highlight notification"), - NULL, GUI_COLOR_INFOBAR_HIGHLIGHT, 0, "white", - NULL, NULL, &config_change_color, NULL, NULL, NULL); /* input window */ config_color_input = config_file_new_option ( weechat_config_file, ptr_section, @@ -1689,7 +1588,6 @@ config_weechat_read () rc = config_file_read (weechat_config_file); if (rc == WEECHAT_CONFIG_READ_OK) { - config_change_infobar_seconds (NULL, NULL); config_change_day_change (NULL, NULL); gui_bar_use_temp_bars (); } diff --git a/src/core/wee-config.h b/src/core/wee-config.h index 3be8ffbed..008e557e0 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -65,10 +65,6 @@ extern struct t_config_option *config_look_hotlist_names_count; extern struct t_config_option *config_look_hotlist_names_length; extern struct t_config_option *config_look_hotlist_names_level; extern struct t_config_option *config_look_hotlist_sort; -extern struct t_config_option *config_look_infobar; -extern struct t_config_option *config_look_infobar_delay_highlight; -extern struct t_config_option *config_look_infobar_seconds; -extern struct t_config_option *config_look_infobar_time_format; extern struct t_config_option *config_look_input_format; extern struct t_config_option *config_look_item_time_format; extern struct t_config_option *config_look_nicklist; @@ -123,11 +119,6 @@ extern struct t_config_option *config_color_status_data_private; extern struct t_config_option *config_color_status_data_highlight; extern struct t_config_option *config_color_status_data_other; extern struct t_config_option *config_color_status_more; -extern struct t_config_option *config_color_infobar; -extern struct t_config_option *config_color_infobar_bg; -extern struct t_config_option *config_color_infobar_delimiters; -extern struct t_config_option *config_color_infobar_highlight; -extern struct t_config_option *config_color_infobar_bg; extern struct t_config_option *config_color_input; extern struct t_config_option *config_color_input_bg; extern struct t_config_option *config_color_input_server; diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 4a1462d77..4cceb09a5 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -28,7 +28,6 @@ gui-filter.c gui-filter.h gui-completion.c gui-completion.h gui-history.c gui-history.h gui-hotlist.c gui-hotlist.h -gui-infobar.c gui-infobar.h gui-input.c gui-input.h gui-keyboard.c gui-keyboard.h gui-main.h diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index fc4a19ece..4d94bb221 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -36,8 +36,6 @@ lib_weechat_gui_common_a_SOURCES = gui-bar.c \ gui-history.h \ gui-hotlist.c \ gui-hotlist.h \ - gui-infobar.c \ - gui-infobar.h \ gui-input.c \ gui-input.h \ gui-keyboard.c \ diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt index 3b97bf1bb..0f8794596 100644 --- a/src/gui/curses/CMakeLists.txt +++ b/src/gui/curses/CMakeLists.txt @@ -15,7 +15,7 @@ # SET(WEECHAT_CURSES_SRC gui-curses-bar.c gui-curses-chat.c gui-curses-color.c -gui-curses-infobar.c gui-curses-input.c gui-curses-keyboard.c gui-curses-main.c +gui-curses-input.c gui-curses-keyboard.c gui-curses-main.c gui-curses-nicklist.c gui-curses-status.c gui-curses-window.c gui-curses.h) SET(EXECUTABLE weechat-curses) diff --git a/src/gui/curses/Makefile.am b/src/gui/curses/Makefile.am index 7f2b59d5f..19bc31384 100644 --- a/src/gui/curses/Makefile.am +++ b/src/gui/curses/Makefile.am @@ -31,7 +31,6 @@ weechat_curses_LDADD = ./../../core/lib_weechat_core.a \ weechat_curses_SOURCES = gui-curses-bar.c \ gui-curses-chat.c \ gui-curses-color.c \ - gui-curses-infobar.c \ gui-curses-input.c \ gui-curses-keyboard.c \ gui-curses-main.c \ diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c index 385c44f0e..818a0f4f3 100644 --- a/src/gui/curses/gui-curses-color.c +++ b/src/gui/curses/gui-curses-color.c @@ -395,10 +395,6 @@ gui_color_init_weechat () gui_color_build (GUI_COLOR_STATUS_DATA_OTHER, CONFIG_COLOR(config_color_status_data_other), CONFIG_COLOR(config_color_status_bg)); gui_color_build (GUI_COLOR_STATUS_MORE, CONFIG_COLOR(config_color_status_more), CONFIG_COLOR(config_color_status_bg)); - gui_color_build (GUI_COLOR_INFOBAR, CONFIG_COLOR(config_color_infobar), CONFIG_COLOR(config_color_infobar_bg)); - gui_color_build (GUI_COLOR_INFOBAR_DELIMITERS, CONFIG_COLOR(config_color_infobar_delimiters), CONFIG_COLOR(config_color_infobar_bg)); - gui_color_build (GUI_COLOR_INFOBAR_HIGHLIGHT, CONFIG_COLOR(config_color_infobar_highlight), CONFIG_COLOR(config_color_infobar_bg)); - gui_color_build (GUI_COLOR_INPUT, CONFIG_COLOR(config_color_input), CONFIG_COLOR(config_color_input_bg)); gui_color_build (GUI_COLOR_INPUT_SERVER, CONFIG_COLOR(config_color_input_server), CONFIG_COLOR(config_color_input_bg)); gui_color_build (GUI_COLOR_INPUT_CHANNEL, CONFIG_COLOR(config_color_input_channel), CONFIG_COLOR(config_color_input_bg)); diff --git a/src/gui/curses/gui-curses-infobar.c b/src/gui/curses/gui-curses-infobar.c deleted file mode 100644 index f4a7d04f8..000000000 --- a/src/gui/curses/gui-curses-infobar.c +++ /dev/null @@ -1,207 +0,0 @@ -/* - * Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org> - * See README for License detail, AUTHORS for developers list. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -/* gui-curses-infobar.c: infobar display functions for Curses GUI */ - - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <stdlib.h> -#include <string.h> -#include <time.h> - -#include "../../core/weechat.h" -#include "../../core/wee-config.h" -#include "../../core/wee-hook.h" -#include "../../core/wee-string.h" -#include "../../plugins/plugin.h" -#include "../gui-infobar.h" -#include "../gui-color.h" -#include "../gui-main.h" -#include "../gui-window.h" -#include "gui-curses.h" - - -/* - * gui_infobar_draw_time: draw time in infobar window - */ - -void -gui_infobar_draw_time (struct t_gui_buffer *buffer) -{ - struct t_gui_window *ptr_win; - time_t time_seconds; - struct tm *local_time; - - /* make C compiler happy */ - (void) buffer; - - if (!gui_ok) - return; - - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) - { - time_seconds = time (NULL); - local_time = localtime (&time_seconds); - if (local_time) - { - gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, - GUI_COLOR_INFOBAR); - mvwprintw (GUI_CURSES(ptr_win)->win_infobar, - 0, 1, - "%02d:%02d", - local_time->tm_hour, local_time->tm_min); - if (CONFIG_BOOLEAN(config_look_infobar_seconds)) - wprintw (GUI_CURSES(ptr_win)->win_infobar, - ":%02d", - local_time->tm_sec); - } - wnoutrefresh (GUI_CURSES(ptr_win)->win_infobar); - } -} - -/* - * gui_infobar_draw: draw infobar window for a buffer - */ - -void -gui_infobar_draw (struct t_gui_buffer *buffer, int erase) -{ - struct t_gui_window *ptr_win; - time_t time_seconds; - struct tm *local_time; - char text_time[1024], *buf; - - /* make C compiler happy */ - (void) buffer; - - if (!gui_ok) - return; - - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) - { - if (erase) - gui_window_clear_weechat (GUI_CURSES(ptr_win)->win_infobar, - GUI_COLOR_INFOBAR); - - gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, - GUI_COLOR_INFOBAR); - - time_seconds = time (NULL); - local_time = localtime (&time_seconds); - if (local_time) - { - strftime (text_time, sizeof (text_time), - CONFIG_STRING(config_look_infobar_time_format), - local_time); - gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, - GUI_COLOR_INFOBAR_DELIMITERS); - wprintw (GUI_CURSES(ptr_win)->win_infobar, "["); - gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, - GUI_COLOR_INFOBAR); - wprintw (GUI_CURSES(ptr_win)->win_infobar, - "%02d:%02d", - local_time->tm_hour, local_time->tm_min); - if (CONFIG_BOOLEAN(config_look_infobar_seconds)) - wprintw (GUI_CURSES(ptr_win)->win_infobar, - ":%02d", - local_time->tm_sec); - gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, - GUI_COLOR_INFOBAR_DELIMITERS); - wprintw (GUI_CURSES(ptr_win)->win_infobar, "]"); - gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, - GUI_COLOR_INFOBAR); - wprintw (GUI_CURSES(ptr_win)->win_infobar, - " %s", text_time); - } - if (gui_infobar) - { - gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, - GUI_COLOR_INFOBAR_DELIMITERS); - wprintw (GUI_CURSES(ptr_win)->win_infobar, " | "); - gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, - gui_infobar->color); - buf = string_iconv_from_internal (NULL, gui_infobar->text); - wprintw (GUI_CURSES(ptr_win)->win_infobar, "%s", - (buf) ? buf : gui_infobar->text); - if (buf) - free (buf); - } - - wnoutrefresh (GUI_CURSES(ptr_win)->win_infobar); - refresh (); - } -} - -/* - * gui_infobar_refresh_timer_cb: timer callback for refresh of infobar - */ - -int -gui_infobar_refresh_timer_cb (void *data) -{ - /* make C compiler happy */ - (void) data; - - if (gui_ok) - { - if (data) - gui_infobar_draw (gui_current_window->buffer, 1); - else - gui_infobar_draw_time (gui_current_window->buffer); - wmove (GUI_CURSES(gui_current_window)->win_input, - 0, gui_current_window->win_input_cursor_x); - wrefresh (GUI_CURSES(gui_current_window)->win_input); - } - - return WEECHAT_RC_OK; -} - -/* - * gui_infobar_highlight_timer_cb: timer callback for highlights in infobar - */ - -int -gui_infobar_highlight_timer_cb (void *data) -{ - /* make C compiler happy */ - (void) data; - - if (gui_ok) - { - if (gui_infobar && (gui_infobar->remaining_time > 0)) - { - gui_infobar->remaining_time--; - if (gui_infobar->remaining_time == 0) - { - gui_infobar_remove (); - gui_infobar_draw (gui_current_window->buffer, 1); - } - } - /* remove this timer if there's no more data for infobar */ - if (!gui_infobar) - { - unhook (gui_infobar_highlight_timer); - gui_infobar_highlight_timer = NULL; - } - } - - return WEECHAT_RC_OK; -} diff --git a/src/gui/curses/gui-curses-keyboard.c b/src/gui/curses/gui-curses-keyboard.c index 7ed66b57c..0f689c1e8 100644 --- a/src/gui/curses/gui-curses-keyboard.c +++ b/src/gui/curses/gui-curses-keyboard.c @@ -94,7 +94,6 @@ gui_keyboard_default_bindings () gui_keyboard_bind (NULL, /* m-j,m-l */ "meta-jmeta-l", "/input jump_last_buffer"); gui_keyboard_bind (NULL, /* m-j,m-p */ "meta-jmeta-p", "/input jump_previous_buffer"); gui_keyboard_bind (NULL, /* m-h */ "meta-h", "/input hotlist_clear"); - gui_keyboard_bind (NULL, /* m-i */ "meta-i", "/input infobar_clear"); gui_keyboard_bind (NULL, /* m-k */ "meta-k", "/input grab_key"); gui_keyboard_bind (NULL, /* m-u */ "meta-u", "/input scroll_unread"); gui_keyboard_bind (NULL, /* ^S^U */ "ctrl-Sctrl-U", "/input set_unread"); diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c index fbca128a0..2fb742703 100644 --- a/src/gui/curses/gui-curses-main.c +++ b/src/gui/curses/gui-curses-main.c @@ -44,7 +44,6 @@ #include "../gui-buffer.h" #include "../gui-chat.h" #include "../gui-color.h" -#include "../gui-infobar.h" #include "../gui-input.h" #include "../gui-history.h" #include "../gui-nicklist.h" @@ -97,8 +96,6 @@ gui_main_init () /* build prefixes according to config */ gui_chat_prefix_build (); - gui_infobar = NULL; - gui_ok = ((COLS >= GUI_WINDOW_MIN_WIDTH) && (LINES >= GUI_WINDOW_MIN_HEIGHT)); @@ -342,10 +339,6 @@ gui_main_end (int clean_exit) /* delete global history */ gui_history_global_free (); - /* delete infobar messages */ - while (gui_infobar) - gui_infobar_remove (); - /* reset title */ if (CONFIG_BOOLEAN(config_look_set_title)) gui_window_title_reset (); diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c index 8420398b1..8ec06f180 100644 --- a/src/gui/curses/gui-curses-window.c +++ b/src/gui/curses/gui-curses-window.c @@ -39,7 +39,6 @@ #include "../gui-chat.h" #include "../gui-color.h" #include "../gui-hotlist.h" -#include "../gui-infobar.h" #include "../gui-input.h" #include "../gui-main.h" #include "../gui-nicklist.h" @@ -90,7 +89,6 @@ gui_window_objects_init (struct t_gui_window *window) GUI_CURSES(window)->win_chat = NULL; GUI_CURSES(window)->win_nick = NULL; GUI_CURSES(window)->win_status = NULL; - GUI_CURSES(window)->win_infobar = NULL; GUI_CURSES(window)->win_input = NULL; GUI_CURSES(window)->win_separator = NULL; GUI_CURSES(window)->bar_windows = NULL; @@ -128,11 +126,6 @@ gui_window_objects_free (struct t_gui_window *window, int free_separator, delwin (GUI_CURSES(window)->win_status); GUI_CURSES(window)->win_status = NULL; } - if (GUI_CURSES(window)->win_infobar) - { - delwin (GUI_CURSES(window)->win_infobar); - GUI_CURSES(window)->win_infobar = NULL; - } if (GUI_CURSES(window)->win_input) { delwin (GUI_CURSES(window)->win_input); @@ -447,9 +440,7 @@ gui_window_calculate_pos_size (struct t_gui_window *window, int force_calculate) if ((CONFIG_INTEGER(config_look_nicklist_min_size) > 0) && (lines < CONFIG_INTEGER(config_look_nicklist_min_size))) lines = CONFIG_INTEGER(config_look_nicklist_min_size); - max_height = (CONFIG_BOOLEAN(config_look_infobar)) ? - window->win_height - add_top - add_bottom - 3 - 4 : - window->win_height - add_top - add_bottom - 2 - 4; + max_height = window->win_height - add_top - add_bottom - 2 - 4; if (lines > max_height) lines = max_height; if (!force_calculate @@ -470,16 +461,8 @@ gui_window_calculate_pos_size (struct t_gui_window *window, int force_calculate) window->win_nick_y = window->win_y + add_top + 1; window->win_nick_width = max_length + ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0); - if (CONFIG_BOOLEAN(config_look_infobar)) - { - window->win_chat_height = window->win_height - add_top - add_bottom - 4; - window->win_nick_height = window->win_height - add_top - add_bottom - 4; - } - else - { - window->win_chat_height = window->win_height - add_top - add_bottom - 3; - window->win_nick_height = window->win_height - add_top - add_bottom - 3; - } + window->win_chat_height = window->win_height - add_top - add_bottom - 3; + window->win_nick_height = window->win_height - add_top - add_bottom - 3; window->win_nick_num_max = window->win_nick_height; break; case CONFIG_LOOK_NICKLIST_RIGHT: @@ -492,16 +475,8 @@ gui_window_calculate_pos_size (struct t_gui_window *window, int force_calculate) window->win_nick_y = window->win_y + add_top + 1; window->win_nick_width = max_length + ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0); - if (CONFIG_BOOLEAN(config_look_infobar)) - { - window->win_chat_height = window->win_height - add_top - add_bottom - 4; - window->win_nick_height = window->win_height - add_top - add_bottom - 4; - } - else - { - window->win_chat_height = window->win_height - add_top - add_bottom - 3; - window->win_nick_height = window->win_height - add_top - add_bottom - 3; - } + window->win_chat_height = window->win_height - add_top - add_bottom - 3; + window->win_nick_height = window->win_height - add_top - add_bottom - 3; window->win_nick_num_max = window->win_nick_height; break; case CONFIG_LOOK_NICKLIST_TOP: @@ -509,12 +484,8 @@ gui_window_calculate_pos_size (struct t_gui_window *window, int force_calculate) window->win_chat_y = window->win_y + add_top + 1 + lines + ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0); window->win_chat_width = window->win_width - add_left - add_right; - if (CONFIG_BOOLEAN(config_look_infobar)) - window->win_chat_height = window->win_height - add_top - add_bottom - 3 - lines - - ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0) - 1; - else - window->win_chat_height = window->win_height - add_top - add_bottom - 3 - lines - - ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0); + window->win_chat_height = window->win_height - add_top - add_bottom - 3 - lines - + ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0); window->win_nick_x = window->win_x + add_left; window->win_nick_y = window->win_y + add_top + 1; window->win_nick_width = window->win_width - add_left - add_right; @@ -526,21 +497,12 @@ gui_window_calculate_pos_size (struct t_gui_window *window, int force_calculate) window->win_chat_x = window->win_x + add_left; window->win_chat_y = window->win_y + add_top + 1; window->win_chat_width = window->win_width - add_left - add_right; - if (CONFIG_BOOLEAN(config_look_infobar)) - window->win_chat_height = window->win_height - add_top - add_bottom - 3 - lines - - ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0) - 1; - else - window->win_chat_height = window->win_height - add_top - add_bottom - 3 - lines - - ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0); + window->win_chat_height = window->win_height - add_top - add_bottom - 3 - lines - + ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0); window->win_nick_x = window->win_x; - if (CONFIG_BOOLEAN(config_look_infobar)) - window->win_nick_y = window->win_y + window->win_height - add_bottom - - 2 - lines - - ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0) - 1; - else - window->win_nick_y = window->win_y + window->win_height - add_bottom - - 2 - lines - - ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0); + window->win_nick_y = window->win_y + window->win_height - add_bottom - + 2 - lines - + ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0); window->win_nick_width = window->win_width; window->win_nick_height = lines + ((CONFIG_BOOLEAN(config_look_nicklist_separator)) ? 1 : 0); @@ -556,10 +518,7 @@ gui_window_calculate_pos_size (struct t_gui_window *window, int force_calculate) window->win_chat_x = window->win_x + add_left; window->win_chat_y = window->win_y + add_top + 1; window->win_chat_width = window->win_width - add_left - add_right; - if (CONFIG_BOOLEAN(config_look_infobar)) - window->win_chat_height = window->win_height - add_top - add_bottom - 4; - else - window->win_chat_height = window->win_height - add_top - add_bottom - 3; + window->win_chat_height = window->win_height - add_top - add_bottom - 3; window->win_chat_cursor_x = window->win_x + add_left; window->win_chat_cursor_y = window->win_y + add_top; window->win_nick_x = -1; @@ -577,29 +536,10 @@ gui_window_calculate_pos_size (struct t_gui_window *window, int force_calculate) /* status window */ window->win_status_x = window->win_x + add_left; - if (CONFIG_BOOLEAN(config_look_infobar)) - window->win_status_y = window->win_y + window->win_height - add_bottom - 3; - else - window->win_status_y = window->win_y + window->win_height - add_bottom - 2; + window->win_status_y = window->win_y + window->win_height - add_bottom - 2; window->win_status_width = window->win_width - add_left - add_right; window->win_status_height = 1; - /* infobar window */ - if (CONFIG_BOOLEAN(config_look_infobar)) - { - window->win_infobar_x = window->win_x + add_left; - window->win_infobar_y = window->win_y + window->win_height - add_bottom - 2; - window->win_infobar_width = window->win_width - add_left - add_right; - window->win_infobar_height = 1; - } - else - { - window->win_infobar_x = -1; - window->win_infobar_y = -1; - window->win_infobar_width = -1; - window->win_infobar_height = -1; - } - /* input window */ window->win_input_x = window->win_x + add_left; window->win_input_y = window->win_y + window->win_height - add_bottom - 1; @@ -649,8 +589,6 @@ gui_window_redraw_buffer (struct t_gui_buffer *buffer) if (buffer->nicklist) gui_nicklist_draw (buffer, 1); gui_status_draw (1); - if (CONFIG_BOOLEAN(config_look_infobar)) - gui_infobar_draw (buffer, 1); gui_input_draw (buffer, 1); } @@ -756,13 +694,7 @@ gui_window_switch_to_buffer (struct t_gui_window *window, window->win_chat_x); } - /* create status/infobar windows */ - if (CONFIG_BOOLEAN(config_look_infobar)) - GUI_CURSES(window)->win_infobar = newwin (window->win_infobar_height, - window->win_infobar_width, - window->win_infobar_y, - window->win_infobar_x); - + /* create status window */ GUI_CURSES(window)->win_status = newwin (window->win_status_height, window->win_status_width, window->win_status_y, @@ -1851,7 +1783,6 @@ gui_window_objects_print_log (struct t_gui_window *window) log_printf (" win_chat. . . . . . : 0x%x", GUI_CURSES(window)->win_chat); log_printf (" win_nick. . . . . . : 0x%x", GUI_CURSES(window)->win_nick); log_printf (" win_status. . . . . : 0x%x", GUI_CURSES(window)->win_status); - log_printf (" win_infobar . . . . : 0x%x", GUI_CURSES(window)->win_infobar); log_printf (" win_input . . . . . : 0x%x", GUI_CURSES(window)->win_input); log_printf (" win_separator . . . : 0x%x", GUI_CURSES(window)->win_separator); log_printf (" bar_windows . . . . : 0x%x", GUI_CURSES(window)->bar_windows); diff --git a/src/gui/curses/gui-curses.h b/src/gui/curses/gui-curses.h index 01580142d..20a9c1c46 100644 --- a/src/gui/curses/gui-curses.h +++ b/src/gui/curses/gui-curses.h @@ -58,7 +58,6 @@ struct t_gui_curses_objects WINDOW *win_chat; /* chat window (example: channel) */ WINDOW *win_nick; /* nick window */ WINDOW *win_status; /* status window */ - WINDOW *win_infobar; /* info bar window */ WINDOW *win_input; /* input window */ WINDOW *win_separator; /* separation between 2 splited (V) win */ struct t_gui_bar_window *bar_windows; /* bar windows */ diff --git a/src/gui/gtk/CMakeLists.txt b/src/gui/gtk/CMakeLists.txt index 121f4ae19..1045c4fa8 100644 --- a/src/gui/gtk/CMakeLists.txt +++ b/src/gui/gtk/CMakeLists.txt @@ -15,7 +15,7 @@ # SET(WEECHAT_GTK_SRC gui-gtk-bar.c gui-gtk-chat.c gui-gtk-color.c -gui-gtk-infobar.c gui-gtk-input.c gui-gtk-keyboard.c gui-gtk-main.c +gui-gtk-input.c gui-gtk-keyboard.c gui-gtk-main.c gui-gtk-nicklist.c gui-gtk-status.c gui-gtk-window.c gui-gtk.h) SET(EXECUTABLE weechat-gtk) diff --git a/src/gui/gtk/Makefile.am b/src/gui/gtk/Makefile.am index a3b89bc17..80faac7e4 100644 --- a/src/gui/gtk/Makefile.am +++ b/src/gui/gtk/Makefile.am @@ -31,7 +31,6 @@ weechat_gtk_LDADD = ./../../core/lib_weechat_core.a \ weechat_gtk_SOURCES = gui-gtk-bar.c \ gui-gtk-chat.c \ gui-gtk-color.c \ - gui-gtk-infobar.c \ gui-gtk-input.c \ gui-gtk-keyboard.c \ gui-gtk-main.c \ diff --git a/src/gui/gtk/gui-gtk-infobar.c b/src/gui/gtk/gui-gtk-infobar.c deleted file mode 100644 index f7582d8c9..000000000 --- a/src/gui/gtk/gui-gtk-infobar.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org> - * See README for License detail, AUTHORS for developers list. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -/* gui-gtk-infobar.c: infobar display functions for Gtk GUI */ - - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <stdlib.h> -#include <string.h> - -#include "../../core/weechat.h" -#include "../../core/wee-config.h" -#include "../../plugins/plugin.h" -#include "../gui-infobar.h" -#include "../gui-window.h" -#include "gui-gtk.h" - - -/* - * gui_infobar_draw_time: draw time in infobar window - */ - -void -gui_infobar_draw_time (struct t_gui_buffer *buffer) -{ - /*struct t_gui_window *ptr_win; - time_t time_seconds; - struct tm *local_time;*/ - - /* make C compiler happy */ - (void) buffer; - - if (!gui_ok) - return; - - /* TODO: write this function for Gtk */ - (void) buffer; -} - -/* - * gui_infobar_draw: draw infobar window for a buffer - */ - -void -gui_infobar_draw (struct t_gui_buffer *buffer, int erase) -{ - /*struct t_gui_window *ptr_win; - time_t time_seconds; - struct tm *local_time; - char text_time[1024 + 1];*/ - - /* make C compiler happy */ - (void) buffer; - - if (!gui_ok) - return; - - /* TODO: write this function for Gtk */ - (void) buffer; - (void) erase; -} - -/* - * gui_infobar_refresh_timer_cb: timer callback for refresh of infobar - */ - -int -gui_infobar_refresh_timer_cb (void *data) -{ - /* make C compiler happy */ - (void) data; - - return WEECHAT_RC_OK; -} - -/* - * gui_infobar_highlight_timer_cb: timer callback for highlights in infobar - */ - -int -gui_infobar_highlight_timer_cb (void *data) -{ - /* make C compiler happy */ - (void) data; - - return WEECHAT_RC_OK; -} diff --git a/src/gui/gtk/gui-gtk-main.c b/src/gui/gtk/gui-gtk-main.c index 4cdb3ff37..71f13cb30 100644 --- a/src/gui/gtk/gui-gtk-main.c +++ b/src/gui/gtk/gui-gtk-main.c @@ -37,7 +37,6 @@ #include "../gui-main.h" #include "../gui-buffer.h" #include "../gui-history.h" -#include "../gui-infobar.h" #include "../gui-input.h" #include "../gui-window.h" #include "gui-gtk.h" @@ -85,8 +84,6 @@ gui_main_init () gui_color_init (); - gui_infobar = NULL; - gui_ok = 1; /* build prefixes according to config */ @@ -238,10 +235,6 @@ gui_main_end (int clean_exit) /* delete global history */ gui_history_global_free (); - /* delete infobar messages */ - while (gui_infobar) - gui_infobar_remove (); - /* reset title */ if (CONFIG_BOOLEAN(config_look_set_title)) gui_window_title_reset (); diff --git a/src/gui/gui-color.h b/src/gui/gui-color.h index 08fd22009..647519218 100644 --- a/src/gui/gui-color.h +++ b/src/gui/gui-color.h @@ -71,10 +71,6 @@ enum t_gui_color_enum GUI_COLOR_STATUS_DATA_OTHER, GUI_COLOR_STATUS_MORE, - GUI_COLOR_INFOBAR, - GUI_COLOR_INFOBAR_DELIMITERS, - GUI_COLOR_INFOBAR_HIGHLIGHT, - GUI_COLOR_INPUT, GUI_COLOR_INPUT_SERVER, GUI_COLOR_INPUT_CHANNEL, diff --git a/src/gui/gui-infobar.c b/src/gui/gui-infobar.c deleted file mode 100644 index 2bfa9f676..000000000 --- a/src/gui/gui-infobar.c +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org> - * See README for License detail, AUTHORS for developers list. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -/* gui-infobar.c: infobar functions, used by all GUI */ - - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <stdlib.h> -#include <string.h> -#include <stdarg.h> - -#include "../core/weechat.h" -#include "../core/wee-hook.h" -#include "../core/wee-log.h" -#include "gui-infobar.h" -#include "gui-color.h" -#include "gui-window.h" - - -struct t_gui_infobar *gui_infobar = NULL; /* infobar content */ -struct t_hook *gui_infobar_refresh_timer = NULL; /* refresh timer */ -struct t_hook *gui_infobar_highlight_timer = NULL; /* highlight timer */ - - -/* - * gui_infobar_printf: display message in infobar - */ - -void -gui_infobar_printf (int delay, int color, const char *message, ...) -{ - static char buf[1024]; - va_list argptr; - struct t_gui_infobar *ptr_infobar; - char *buf2, *ptr_buf, *pos; - - if (!message) - return; - - va_start (argptr, message); - vsnprintf (buf, sizeof (buf) - 1, message, argptr); - va_end (argptr); - - ptr_infobar = malloc (sizeof (*ptr_infobar)); - if (ptr_infobar) - { - buf2 = (char *)gui_color_decode ((unsigned char *)buf); - ptr_buf = (buf2) ? buf2 : buf; - - ptr_infobar->color = color; - ptr_infobar->text = strdup (ptr_buf); - pos = strchr (ptr_infobar->text, '\n'); - if (pos) - pos[0] = '\0'; - ptr_infobar->remaining_time = (delay <= 0) ? -1 : delay; - ptr_infobar->next_infobar = gui_infobar; - gui_infobar = ptr_infobar; - gui_infobar_draw (gui_current_window->buffer, 1); - if (buf2) - free (buf2); - - if (!gui_infobar_highlight_timer) - gui_infobar_highlight_timer = hook_timer (NULL, 1 * 1000, 0, 0, - &gui_infobar_highlight_timer_cb, - NULL); - } - else - log_printf (_("Error: not enough memory for infobar message")); -} - -/* - * gui_infobar_remove: remove last displayed message in infobar - */ - -void -gui_infobar_remove () -{ - struct t_gui_infobar *new_infobar; - - if (gui_infobar) - { - new_infobar = gui_infobar->next_infobar; - if (gui_infobar->text) - free (gui_infobar->text); - free (gui_infobar); - gui_infobar = new_infobar; - } -} - -/* - * gui_infobar_remove_all: remove last displayed message in infobar - */ - -void -gui_infobar_remove_all () -{ - while (gui_infobar) - { - gui_infobar_remove (); - } -} diff --git a/src/gui/gui-infobar.h b/src/gui/gui-infobar.h deleted file mode 100644 index 8a2e4bc7d..000000000 --- a/src/gui/gui-infobar.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2003-2008 by FlashCode <flashcode@flashtux.org> - * See README for License detail, AUTHORS for developers list. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - - -#ifndef __WEECHAT_GUI_INFOBAR_H -#define __WEECHAT_GUI_INFOBAR_H 1 - -struct t_gui_infobar -{ - int color; /* text color */ - char *text; /* infobar text */ - int remaining_time; /* delay (sec) before erasing this text */ - /* if < 0, text is never erased (except */ - /* by user action to erase it) */ - struct t_gui_infobar *next_infobar; /* next message for infobar */ -}; - -/* infobar variables */ - -extern struct t_gui_infobar *gui_infobar; -extern struct t_hook *gui_infobar_refresh_timer; -extern struct t_hook *gui_infobar_highlight_timer; - -/* infobar functions */ - -extern void gui_infobar_printf (int delay, int color, - const char *message, ...); -extern void gui_infobar_remove (); -extern void gui_infobar_remove_all (); - -/* infobar functions (GUI dependent) */ - -extern void gui_infobar_draw_time (struct t_gui_buffer *buffer); -extern void gui_infobar_draw (struct t_gui_buffer *buffer, int erase); -extern int gui_infobar_refresh_timer_cb (void *data); -extern int gui_infobar_highlight_timer_cb (void *data); - -#endif /* gui-infobar.h */ diff --git a/src/gui/gui-input.c b/src/gui/gui-input.c index 0394f68f7..a14d749c9 100644 --- a/src/gui/gui-input.c +++ b/src/gui/gui-input.c @@ -38,7 +38,6 @@ #include "gui-completion.h" #include "gui-history.h" #include "gui-hotlist.h" -#include "gui-infobar.h" #include "gui-keyboard.h" #include "gui-status.h" #include "gui-window.h" @@ -1258,17 +1257,6 @@ gui_input_hotlist_clear () } /* - * gui_input_infobar_clear: clear infobar (default key: meta-i) - */ - -void -gui_input_infobar_clear () -{ - gui_infobar_remove (); - gui_infobar_draw (gui_current_window->buffer, 1); -} - -/* * gui_input_grab_key: init "grab key mode" (next key will be inserted into * input buffer) (default key: meta-k) */ diff --git a/src/gui/gui-input.h b/src/gui/gui-input.h index 25a138e93..148cda6e5 100644 --- a/src/gui/gui-input.h +++ b/src/gui/gui-input.h @@ -62,7 +62,6 @@ extern void gui_input_jump_smart (); extern void gui_input_jump_last_buffer (); extern void gui_input_jump_previous_buffer (); extern void gui_input_hotlist_clear (); -extern void gui_input_infobar_clear (); extern void gui_input_grab_key (); extern void gui_input_scroll_unread (); extern void gui_input_set_unread (); diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c index dd126ab85..90ad30893 100644 --- a/src/gui/gui-window.c +++ b/src/gui/gui-window.c @@ -236,11 +236,6 @@ gui_window_new (struct t_gui_window *parent, int x, int y, int width, int height new_window->win_status_width = 0; new_window->win_status_height = 0; - new_window->win_infobar_x = 0; - new_window->win_infobar_y = 0; - new_window->win_infobar_width = 0; - new_window->win_infobar_height = 0; - new_window->win_input_x = 0; new_window->win_input_y = 0; new_window->win_input_width = 0; @@ -925,10 +920,6 @@ gui_window_print_log () log_printf (" win_status_y. . . . : %d", ptr_window->win_status_y); log_printf (" win_status_width. . : %d", ptr_window->win_status_width); log_printf (" win_status_height . : %d", ptr_window->win_status_height); - log_printf (" win_infobar_x . . . : %d", ptr_window->win_infobar_x); - log_printf (" win_infobar_y . . . : %d", ptr_window->win_infobar_y); - log_printf (" win_infobar_width . : %d", ptr_window->win_infobar_width); - log_printf (" win_infobar_height. : %d", ptr_window->win_infobar_height); log_printf (" win_input_x . . . . : %d", ptr_window->win_input_x); log_printf (" win_input_y . . . . : %d", ptr_window->win_input_y); log_printf (" win_input_width . . : %d", ptr_window->win_input_width); diff --git a/src/gui/gui-window.h b/src/gui/gui-window.h index f5d0564e5..132744dae 100644 --- a/src/gui/gui-window.h +++ b/src/gui/gui-window.h @@ -64,12 +64,6 @@ struct t_gui_window int win_status_width; /* width of status window */ int win_status_height; /* height of status window */ - /* infobar bar settings */ - int win_infobar_x; /* infobar window position */ - int win_infobar_y; /* infobar window position */ - int win_infobar_width; /* width of infobar window */ - int win_infobar_height; /* height of infobar window */ - /* input window settings */ int win_input_x; /* input window position */ int win_input_y; /* input window position */ diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c index 50deeae5e..cf7ea2dc3 100644 --- a/src/plugins/demo/demo.c +++ b/src/plugins/demo/demo.c @@ -107,26 +107,6 @@ demo_printf_command_cb (void *data, struct t_gui_buffer *buffer, int argc, } /* - * demo_infobar_command_cb: demo command for infobar - */ - -int -demo_infobar_command_cb (void *data, struct t_gui_buffer *buffer, int argc, - char **argv, char **argv_eol) -{ - /* make C compiler happy */ - (void) data; - (void) buffer; - (void) argv; - - weechat_infobar_printf (10, NULL, - (argc > 1) ? - argv_eol[1] : _("test message in infobar")); - - return WEECHAT_RC_OK; -} - -/* * demo_buffer_input_data_cb: callback for input data on buffer */ @@ -419,14 +399,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) _("text: write this text"), "", &demo_printf_command_cb, NULL); - - weechat_hook_command ("demo_infobar", - _("print a message in infobar for 10 seconds"), - _("[text]"), - _("text: write this text"), - "", - &demo_infobar_command_cb, NULL); - + weechat_hook_command ("demo_buffer", _("open a new buffer"), _("category name"), diff --git a/src/plugins/irc/irc.h b/src/plugins/irc/irc.h index 14874cee7..af39b60a8 100644 --- a/src/plugins/irc/irc.h +++ b/src/plugins/irc/irc.h @@ -55,7 +55,6 @@ #define IRC_COLOR_CHAT_NICK_SELF weechat_color("chat_nick_self") #define IRC_COLOR_CHAT_NICK_OTHER weechat_color("chat_nick_other") #define IRC_COLOR_CHAT_SERVER weechat_color("chat_server") -#define IRC_COLOR_INFOBAR_HIGHLIGHT weechat_color("infobar_highlight") #define IRC_COLOR_NICKLIST_PREFIX1 weechat_color("nicklist_prefix1") #define IRC_COLOR_NICKLIST_PREFIX2 weechat_color("nicklist_prefix2") #define IRC_COLOR_NICKLIST_PREFIX3 weechat_color("nicklist_prefix3") diff --git a/src/plugins/plugin-api.c b/src/plugins/plugin-api.c index db7b10dcc..33ca576b2 100644 --- a/src/plugins/plugin-api.c +++ b/src/plugins/plugin-api.c @@ -40,7 +40,6 @@ #include "../gui/gui-chat.h" #include "../gui/gui-color.h" #include "../gui/gui-filter.h" -#include "../gui/gui-infobar.h" #include "../gui/gui-keyboard.h" #include "../gui/gui-nicklist.h" #include "../gui/gui-window.h" @@ -323,63 +322,6 @@ plugin_api_color (const char *color_name) } /* - * plugin_api_infobar_printf: print a message in infobar - */ - -void -plugin_api_infobar_printf (struct t_weechat_plugin *plugin, int delay, - const char *color_name, const char *format, ...) -{ - va_list argptr; - static char buf[1024]; - char *buf2; - int num_color; - - if (!plugin || !format) - return; - - va_start (argptr, format); - vsnprintf (buf, sizeof (buf) - 1, format, argptr); - va_end (argptr); - - buf2 = string_iconv_to_internal (plugin->charset, buf); - if (color_name && color_name[0]) - { - num_color = gui_color_search_config_int (color_name); - if (num_color < 0) - num_color = GUI_COLOR_INFOBAR; - } - else - num_color = GUI_COLOR_INFOBAR; - - gui_infobar_printf (delay, num_color, - "%s", - (buf2) ? buf2 : buf); - if (buf2) - free (buf2); -} - -/* - * plugin_api_infobar_remove: remove message(s) in infobar - */ - -void -plugin_api_infobar_remove (int how_many) -{ - if (how_many <= 0) - gui_infobar_remove_all (); - else - { - while ((gui_infobar) && (how_many > 0)) - { - gui_infobar_remove (); - how_many--; - } - } - gui_infobar_draw (gui_current_window->buffer, 1); -} - -/* * plugin_api_command: execute a command (simulate user entry) */ @@ -694,14 +636,6 @@ plugin_api_infolist_get_add_window (struct t_plugin_infolist *infolist, return 0; if (!plugin_infolist_new_var_integer (ptr_item, "status_height", window->win_status_height)) return 0; - if (!plugin_infolist_new_var_integer (ptr_item, "infobar_x", window->win_infobar_x)) - return 0; - if (!plugin_infolist_new_var_integer (ptr_item, "infobar_y", window->win_infobar_y)) - return 0; - if (!plugin_infolist_new_var_integer (ptr_item, "infobar_width", window->win_infobar_width)) - return 0; - if (!plugin_infolist_new_var_integer (ptr_item, "infobar_height", window->win_infobar_height)) - return 0; if (!plugin_infolist_new_var_integer (ptr_item, "input_x", window->win_input_x)) return 0; if (!plugin_infolist_new_var_integer (ptr_item, "input_y", window->win_input_y)) diff --git a/src/plugins/plugin-api.h b/src/plugins/plugin-api.h index 4d93117e9..06be85775 100644 --- a/src/plugins/plugin-api.h +++ b/src/plugins/plugin-api.h @@ -41,10 +41,6 @@ extern int plugin_api_config_set_plugin (struct t_weechat_plugin *plugin, /* display */ extern char *plugin_api_prefix (const char *prefix); extern char *plugin_api_color (const char *color_name); -extern void plugin_api_infobar_printf (struct t_weechat_plugin *plugin, - int delay, const char *color_name, - const char *format, ...); -extern void plugin_api_infobar_remove (int how_many); /* command */ extern void plugin_api_command (struct t_weechat_plugin *plugin, diff --git a/src/plugins/plugin.c b/src/plugins/plugin.c index 70a52f70a..d7836afbf 100644 --- a/src/plugins/plugin.c +++ b/src/plugins/plugin.c @@ -367,8 +367,6 @@ plugin_load (const char *filename) new_plugin->color = &plugin_api_color; new_plugin->printf_date_tags = &gui_chat_printf_date_tags; new_plugin->printf_y = &gui_chat_printf_y; - new_plugin->infobar_printf = &plugin_api_infobar_printf; - new_plugin->infobar_remove = &plugin_api_infobar_remove; new_plugin->log_printf = &log_printf; new_plugin->hook_command = &hook_command; diff --git a/src/plugins/scripts/lua/weechat-lua-api.c b/src/plugins/scripts/lua/weechat-lua-api.c index ad1ddae0b..0b0db0ff3 100644 --- a/src/plugins/scripts/lua/weechat-lua-api.c +++ b/src/plugins/scripts/lua/weechat-lua-api.c @@ -2177,81 +2177,6 @@ weechat_lua_api_print_y (lua_State *L) } /* - * weechat_lua_api_infobar_print: print message to infobar - */ - -static int -weechat_lua_api_infobar_print (lua_State *L) -{ - const char *color, *message; - int delay, n; - - /* make C compiler happy */ - (void) L; - - if (!lua_current_script) - { - WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("infobar_print"); - LUA_RETURN_ERROR; - } - - delay = 1; - color = NULL; - message = NULL; - - n = lua_gettop (lua_current_interpreter); - - if (n < 3) - { - WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("infobar_print"); - LUA_RETURN_ERROR; - } - - delay = lua_tonumber (lua_current_interpreter, -3); - color = lua_tostring (lua_current_interpreter, -2); - message = lua_tostring (lua_current_interpreter, -1); - - script_api_infobar_printf (weechat_lua_plugin, - lua_current_script, - delay, - color, - "%s", - message); - - LUA_RETURN_OK; -} - -/* - * weechat_lua_api_infobar_remove: remove message(s) in infobar - */ - -static int -weechat_lua_api_infobar_remove (lua_State *L) -{ - int n, how_many; - - /* make C compiler happy */ - (void) L; - - if (!lua_current_script) - { - WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("infobar_remove"); - LUA_RETURN_ERROR; - } - - how_many = 0; - - n = lua_gettop (lua_current_interpreter); - - if (n == 1) - how_many = lua_tonumber (lua_current_interpreter, -1); - - weechat_infobar_remove (how_many); - - LUA_RETURN_OK; -} - -/* * weechat_lua_api_log_print: print message in WeeChat log file */ @@ -5033,8 +4958,6 @@ const struct luaL_reg weechat_lua_api_funcs[] = { { "print", &weechat_lua_api_print }, { "print_date_tags", &weechat_lua_api_print_date_tags }, { "print_y", &weechat_lua_api_print_y }, - { "infobar_print", &weechat_lua_api_infobar_print }, - { "infobar_remove", &weechat_lua_api_infobar_remove }, { "log_print", &weechat_lua_api_log_print }, { "hook_command", &weechat_lua_api_hook_command }, { "hook_timer", &weechat_lua_api_hook_timer }, diff --git a/src/plugins/scripts/perl/weechat-perl-api.c b/src/plugins/scripts/perl/weechat-perl-api.c index 0ae18e0c7..a77fbe329 100644 --- a/src/plugins/scripts/perl/weechat-perl-api.c +++ b/src/plugins/scripts/perl/weechat-perl-api.c @@ -1792,64 +1792,6 @@ static XS (XS_weechat_print_y) } /* - * weechat::infobar_print: print message to infobar - */ - -static XS (XS_weechat_infobar_print) -{ - char *color, *message; - dXSARGS; - - /* make C compiler happy */ - (void) cv; - - if (!perl_current_script) - { - WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("infobar_print"); - PERL_RETURN_ERROR; - } - - if (items < 3) - { - WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("infobar_print"); - PERL_RETURN_ERROR; - } - - color = SvPV (ST (1), PL_na); - message = SvPV (ST (2), PL_na); - script_api_infobar_printf (weechat_perl_plugin, - perl_current_script, - SvIV (ST (0)), /* delay */ - color, - "%s", - message); - - PERL_RETURN_OK; -} - -/* - * weechat::infobar_remove: remove message(s) from infobar - */ - -static XS (XS_weechat_infobar_remove) -{ - dXSARGS; - - /* make C compiler happy */ - (void) cv; - - if (!perl_current_script) - { - WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("infobar_remove"); - PERL_RETURN_ERROR; - } - - weechat_infobar_remove ((items >= 1) ? SvIV (ST (0)) : 0); /* how_many */ - - PERL_RETURN_OK; -} - -/* * weechat::log_print: print message in WeeChat log file */ @@ -3947,8 +3889,6 @@ weechat_perl_api_init (pTHX) newXS ("weechat::print", XS_weechat_print, "weechat"); newXS ("weechat::print_date_tags", XS_weechat_print_date_tags, "weechat"); newXS ("weechat::print_y", XS_weechat_print_y, "weechat"); - newXS ("weechat::infobar_print", XS_weechat_infobar_print, "weechat"); - newXS ("weechat::infobar_remove", XS_weechat_infobar_remove, "weechat"); newXS ("weechat::log_print", XS_weechat_log_print, "weechat"); newXS ("weechat::hook_command", XS_weechat_hook_command, "weechat"); newXS ("weechat::hook_timer", XS_weechat_hook_timer, "weechat"); diff --git a/src/plugins/scripts/python/weechat-python-api.c b/src/plugins/scripts/python/weechat-python-api.c index 7420e1e74..8d7c4f990 100644 --- a/src/plugins/scripts/python/weechat-python-api.c +++ b/src/plugins/scripts/python/weechat-python-api.c @@ -1905,72 +1905,6 @@ weechat_python_api_prnt_y (PyObject *self, PyObject *args) } /* - * weechat_python_api_infobar_print: print message to infobar - */ - -static PyObject * -weechat_python_api_infobar_print (PyObject *self, PyObject *args) -{ - int delay; - char *color, *message; - - /* make C compiler happy */ - (void) self; - - if (!python_current_script) - { - WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("infobar_print"); - PYTHON_RETURN_ERROR; - } - - delay = 1; - message = NULL; - - if (!PyArg_ParseTuple (args, "iss", &delay, &color, &message)) - { - WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("infobar_print"); - PYTHON_RETURN_ERROR; - } - - script_api_infobar_printf (weechat_python_plugin, - python_current_script, - delay, color, "%s", message); - - PYTHON_RETURN_OK; -} - -/* - * weechat_python_api_infobar_remove: remove message(s) from infobar - */ - -static PyObject * -weechat_python_api_infobar_remove (PyObject *self, PyObject *args) -{ - int how_many; - - /* make C compiler happy */ - (void) self; - - if (!python_current_script) - { - WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("infobar_remove"); - PYTHON_RETURN_ERROR; - } - - how_many = 0; - - if (!PyArg_ParseTuple (args, "|i", &how_many)) - { - WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("infobar_remove"); - PYTHON_RETURN_ERROR; - } - - weechat_infobar_remove (how_many); - - PYTHON_RETURN_OK; -} - -/* * weechat_python_api_log_print: print message in WeeChat log file */ @@ -4197,8 +4131,6 @@ PyMethodDef weechat_python_funcs[] = { "prnt", &weechat_python_api_prnt, METH_VARARGS, "" }, { "prnt_date_tags", &weechat_python_api_prnt_date_tags, METH_VARARGS, "" }, { "prnt_y", &weechat_python_api_prnt_y, METH_VARARGS, "" }, - { "infobar_print", &weechat_python_api_infobar_print, METH_VARARGS, "" }, - { "infobar_remove", &weechat_python_api_infobar_remove, METH_VARARGS, "" }, { "log_print", &weechat_python_api_log_print, METH_VARARGS, "" }, { "hook_command", &weechat_python_api_hook_command, METH_VARARGS, "" }, { "hook_timer", &weechat_python_api_hook_timer, METH_VARARGS, "" }, diff --git a/src/plugins/scripts/ruby/weechat-ruby-api.c b/src/plugins/scripts/ruby/weechat-ruby-api.c index b63a0f59a..92e07af80 100644 --- a/src/plugins/scripts/ruby/weechat-ruby-api.c +++ b/src/plugins/scripts/ruby/weechat-ruby-api.c @@ -2200,87 +2200,6 @@ weechat_ruby_api_print_y (VALUE class, VALUE buffer, VALUE y, VALUE message) } /* - * weechat_ruby_api_infobar_print: print message to infobar - */ - -static VALUE -weechat_ruby_api_infobar_print (VALUE class, VALUE delay, VALUE color, - VALUE message) -{ - int c_delay; - char *c_color, *c_message; - - /* make C compiler happy */ - (void) class; - - if (!ruby_current_script) - { - WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("infobar_print"); - RUBY_RETURN_ERROR; - } - - c_delay = 1; - c_color = NULL; - c_message = NULL; - - if (NIL_P (delay) || NIL_P (color) || NIL_P (message)) - { - WEECHAT_SCRIPT_MSG_WRONG_ARGUMENTS("infobar_print"); - RUBY_RETURN_ERROR; - } - - Check_Type (delay, T_FIXNUM); - Check_Type (color, T_STRING); - Check_Type (message, T_STRING); - - c_delay = FIX2INT (delay); - c_color = STR2CSTR (color); - c_message = STR2CSTR (message); - - script_api_infobar_printf (weechat_ruby_plugin, - ruby_current_script, - c_delay, c_color, "%s", c_message); - - RUBY_RETURN_OK; -} - -/* - * weechat_ruby_api_infobar_remove: remove message(s) from infobar - */ - -static VALUE -weechat_ruby_api_infobar_remove (int argc, VALUE *argv, VALUE class) -{ - VALUE how_many; - int c_how_many; - - /* make C compiler happy */ - (void) class; - - if (!ruby_current_script) - { - WEECHAT_SCRIPT_MSG_NOT_INITIALIZED("infobar_remove"); - RUBY_RETURN_ERROR; - } - - how_many = Qnil; - - rb_scan_args (argc, argv, "01", &how_many); - - if (!NIL_P (how_many)) - { - Check_Type (how_many, T_FIXNUM); - c_how_many = FIX2INT (how_many); - } - else - c_how_many = 0; - - weechat_infobar_remove (c_how_many); - - RUBY_RETURN_OK; -} - -/* * weechat_ruby_api_log_print: print message in WeeChat log file */ @@ -4840,8 +4759,6 @@ weechat_ruby_api_init (VALUE ruby_mWeechat) rb_define_module_function (ruby_mWeechat, "print", &weechat_ruby_api_print, 2); rb_define_module_function (ruby_mWeechat, "print_date_tags", &weechat_ruby_api_print_date_tags, 4); rb_define_module_function (ruby_mWeechat, "print_y", &weechat_ruby_api_print_y, 3); - rb_define_module_function (ruby_mWeechat, "infobar_print", &weechat_ruby_api_infobar_print, 3); - rb_define_module_function (ruby_mWeechat, "infobar_remove", &weechat_ruby_api_infobar_remove, -1); rb_define_module_function (ruby_mWeechat, "log_print", &weechat_ruby_api_log_print, 1); rb_define_module_function (ruby_mWeechat, "hook_command", &weechat_ruby_api_hook_command, 6); rb_define_module_function (ruby_mWeechat, "hook_timer", &weechat_ruby_api_hook_timer, 4); diff --git a/src/plugins/scripts/script-api.c b/src/plugins/scripts/script-api.c index a00f48d66..6c2d5a743 100644 --- a/src/plugins/scripts/script-api.c +++ b/src/plugins/scripts/script-api.c @@ -536,31 +536,6 @@ script_api_printf_y (struct t_weechat_plugin *weechat_plugin, } /* - * script_api_infobar_printf: print a message in infobar - */ - -void -script_api_infobar_printf (struct t_weechat_plugin *weechat_plugin, - struct t_plugin_script *script, - int delay, const char *color_name, - const char *format, ...) -{ - va_list argptr; - char buf[1024]; - char *buf2; - - va_start (argptr, format); - vsnprintf (buf, sizeof (buf) - 1, format, argptr); - va_end (argptr); - - buf2 = (script->charset && script->charset[0]) ? - weechat_iconv_to_internal (script->charset, buf) : NULL; - weechat_infobar_printf (delay, color_name, "%s", (buf2) ? buf2 : buf); - if (buf2) - free (buf2); -} - -/* * script_api_log_printf: add a message in WeeChat log file */ diff --git a/src/plugins/scripts/script-api.h b/src/plugins/scripts/script-api.h index 9a8270775..573fab44f 100644 --- a/src/plugins/scripts/script-api.h +++ b/src/plugins/scripts/script-api.h @@ -80,10 +80,6 @@ extern void script_api_printf_y (struct t_weechat_plugin *weechat_plugin, struct t_plugin_script *script, struct t_gui_buffer *buffer, int y, const char *format, ...); -extern void script_api_infobar_printf (struct t_weechat_plugin *weechat_plugin, - struct t_plugin_script *script, - int delay, const char *color_name, - const char *format, ...); extern void script_api_log_printf (struct t_weechat_plugin *weechat_plugin, struct t_plugin_script *script, const char *format, ...); diff --git a/src/plugins/weechat-plugin.h b/src/plugins/weechat-plugin.h index 8ed79cf65..3af989b0b 100644 --- a/src/plugins/weechat-plugin.h +++ b/src/plugins/weechat-plugin.h @@ -294,9 +294,6 @@ struct t_weechat_plugin const char *tags, const char *message, ...); void (*printf_y) (struct t_gui_buffer *buffer, int y, const char *message, ...); - void (*infobar_printf) (struct t_weechat_plugin *plugin, int delay, - const char *color_name, const char *format, ...); - void (*infobar_remove) (int how_many); void (*log_printf) (const char *message, ...); /* hooks */ @@ -736,12 +733,6 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin); __argz...) \ weechat_plugin->printf_date_tags(__buffer, __date, __tags, \ __message, ##__argz) -#define weechat_infobar_printf(__delay, __color_name, __message, \ - __argz...) \ - weechat_plugin->infobar_printf(weechat_plugin, __delay, \ - __color_name, __message, ##__argz) -#define weechat_infobar_remove(__how_many) \ - weechat_plugin->infobar_remove(__how_many) #define weechat_log_printf(__message, __argz...) \ weechat_plugin->log_printf(__message, ##__argz) |