Commits December 2006

commits@gajim.org

6 participants
160 discussions

[commit-gajim] r7744 - www-website/locale/bg_BG/LC_MESSAGES
by asterix＠gajim.org 30 Dec '06

30 Dec '06

Author: asterix Date: 2006-12-30 12:32:32 +0100 (Sat, 30 Dec 2006) New Revision: 7744 Modified: www-website/locale/bg_BG/LC_MESSAGES/msg.po Log: [Yavor] updated bulgarian translation of website Modified: www-website/locale/bg_BG/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/bg_BG/LC_MESSAGES/msg.po 2006-12-30 01:01:00 UTC (rev 7743) +++ www-website/locale/bg_BG/LC_MESSAGES/msg.po 2006-12-30 11:32:32 UTC (rev 7744) @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-12-19 17:46+0100\n" -"PO-Revision-Date: 2006-03-16 21:40+0200\n" +"POT-Creation-Date: 2006-12-29 18:11+0200\n" +"PO-Revision-Date: 2006-12-29 19:03+0200\n" "Last-Translator: Yavor Doganov <yavor(a)doganov.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" "MIME-Version: 1.0\n" @@ -43,23 +43,23 @@ #: Design.php:94 msgid "Debian" -msgstr "Debian" +msgstr "Дебиан" #: Design.php:95 msgid "Slackware" -msgstr "" +msgstr "Слакуер" #: Design.php:96 msgid "Ubuntu" -msgstr "Ubuntu" +msgstr "Убунту" #: Design.php:97 msgid "Fedora" -msgstr "Fedora" +msgstr "Федора" #: Design.php:98 msgid "Gentoo" -msgstr "Gentoo" +msgstr "Дженту" #: Design.php:99 msgid "Archlinux" @@ -79,7 +79,7 @@ #: Design.php:103 msgid "Mandriva" -msgstr "" +msgstr "Мандрива" #: Design.php:104 msgid "FreeBSD" @@ -91,7 +91,7 @@ #: Design.php:106 msgid "Windows installer" -msgstr "Инсталатор за Windows" +msgstr "Инсталатор за „Уиндоус“" #: Design.php:107 msgid "Source" @@ -115,28 +115,27 @@ #: Design.php:115 msgid "Jabber" -msgstr "Jabber" +msgstr "Джабър" #: Design.php:116 msgid "Structure" msgstr "Структура" #: Design.php:133 -#, fuzzy msgid " Language:" -msgstr " Език: \n" +msgstr " Език:" -#: Design.php:173 +#: Design.php:174 msgid "" " Site optimized for W3C Standards and realized with vim editor under GNU/" "Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" msgstr "" " Страницата е оптимизирана по стандартите на W3C и реализирана с редактора " -"vim под GNU/Linux от Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" +"vim под GNU/Линукс от Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" #: dev.php:5 downloads.php:5 index.php:7 screenshots.php:7 msgid "Gajim, a Jabber client" -msgstr "Gajim, Jabber клиент" +msgstr "Gajim, Джабър клиент" #: dev.php:10 msgid " Our Room" @@ -210,13 +209,12 @@ msgstr " Може да помогнете да направим Gajim дори по-добър чрез:\n" #: dev.php:41 -#, fuzzy msgid "" " Coding: contact us on our mailing list or in our room gajim@conference." "gajim.org \n" msgstr "" " Програмиране: свържете се с нас чрез пощенския списък или в стаята " -"gajim(a)conference.jabber.no \n" +"gajim(a)conference.gajim.org \n" #: dev.php:44 msgid " Submitting a translation: see" @@ -236,7 +234,7 @@ #: dev.php:50 msgid " Donating: contact me on Jabber (asterix(a)jabber.lagaule.org)" -msgstr "" +msgstr " Дарения: свържете се с мен по Джабър (asterix(a)jabber.lagaule.org)" #: dev.php:56 msgid " Authors" @@ -276,7 +274,7 @@ #: docs.php:21 downloads.php:144 msgid " Under GNU/Linux\n" -msgstr " Под GNU/Linux\n" +msgstr " Под GNU/Линукс\n" #: docs.php:23 msgid "" @@ -284,11 +282,11 @@ "python2.3-gtk2 and python2.3-glade2.\n" msgstr "" " За да използвате тази версия, трябва да инсталирате някои пакети: " -"python2.3 python2.3-gtk2 и python2.3-glade2.\n" +"python2.3, python2.3-gtk2 и python2.3-glade2.\n" #: docs.php:24 msgid " (With Debian, just run:" -msgstr " (За Debian, просто изпълнете:" +msgstr " (За Дебиан, просто изпълнете:" #: docs.php:25 msgid " Note that python2.4 can be used instead of python2.3.\n" @@ -346,7 +344,7 @@ #: docs.php:40 msgid " Under Microsoft Windows\n" -msgstr " Под Microsoft Windows\n" +msgstr " Под „Майкрософт Уиндоус“\n" #: docs.php:42 msgid " In a first time, you have to install" @@ -362,7 +360,7 @@ #: docs.php:46 msgid "(Gajim works with python-2.4.x)" -msgstr "" +msgstr "(Gajim работи с python-2.4.x)" #: docs.php:46 docs.php:49 msgid "and install it.\n" @@ -403,9 +401,8 @@ msgstr " Моля, прочетете" #: docs.php:70 -#, fuzzy msgid " Structure\n" -msgstr "Структура" +msgstr " Структура\n" #: docs.php:72 msgid " You can see how Gajim is structured" @@ -421,7 +418,7 @@ #: docs.php:76 msgid "library to do the interface with Jabber network.\n" -msgstr "за интерфейс към мрежата Jabber.\n" +msgstr "за интерфейс към мрежата Джабър.\n" #: downloads.php:8 msgid " Latest version of Gajim is" @@ -445,7 +442,7 @@ #: downloads.php:17 msgid " If you use Debian unstable do" -msgstr " Ако използвате Debian unstable, напишете" +msgstr " Ако използвате Дебиан „unstable“, напишете" #: downloads.php:19 msgid " A daily package from svn is also built. To use it, remove gajim" @@ -463,22 +460,20 @@ #: downloads.php:31 downloads.php:108 msgid "Soon available here." -msgstr "" +msgstr "Скоро достъпен тук." #: downloads.php:40 msgid " If you use Ubuntu universe repository do" -msgstr " Ако използвате хранилището „universe“ на Ubuntu, изпълнете" +msgstr " Ако използвате хранилището „universe“ на Убунту, изпълнете" #: downloads.php:48 -#, fuzzy msgid " You can install Gajim provided you have Fedora Extras repository by" msgstr "" -" Може да инстлирате Gajim под FC4, ако имате хранилището „Fedora Extras“, " -"с" +" Може да инсталирате Gajim, ако имате хранилището „Fedora Extras“, с" #: downloads.php:53 msgid " Gentoo\n" -msgstr " Gentoo\n" +msgstr " Дженту\n" #: downloads.php:56 downloads.php:63 downloads.php:91 msgid " Just" @@ -505,9 +500,8 @@ msgstr "rpm пакет на pydns" #: downloads.php:70 -#, fuzzy msgid "python-sqlite2 rpm" -msgstr "rpm пакет на python-sqlite" +msgstr "rpm пакет на python-sqlite2" #: downloads.php:74 msgid " PLD\n" @@ -537,8 +531,7 @@ #: downloads.php:99 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr "" -" Може да използвате Gajim под FreeBSD чрез FreeBSD ports. Просто " -"изпълнете " +" Може да използвате Gajim под FreeBSD чрез портовете. Просто изпълнете " #: downloads.php:101 msgid "Find out more" @@ -550,7 +543,7 @@ #: downloads.php:118 msgid " Windows installer\n" -msgstr " Инсталатор за Windows\n" +msgstr " Инсталатор за „Уиндоус“\n" #: downloads.php:121 msgid " There is a Gajim installer " @@ -570,7 +563,7 @@ "latest version of the GTK+ Runtime Environment" msgstr "" " Ако използвате инсталатора без GTK, трябва да изтеглите последната " -"версия на GTK+ Runtime Environment" +"версия на библиотеката GTK+" #: downloads.php:123 msgid "" @@ -621,7 +614,7 @@ "under Debian)\n" msgstr "" " Да инсталирате subversion (<i>apt-get install subversion</i> под " -"Debian)\n" +"Дебиан)\n" #: downloads.php:149 msgid " Then in a console, enter the following commands:\n" @@ -645,15 +638,15 @@ #: downloads.php:174 msgid " Under Windows\n" -msgstr " Под Windows\n" +msgstr " Под „Уиндоус“\n" #: downloads.php:176 msgid "" " You first have to install subversion for windows. In order to do that, " "download the binary" msgstr "" -" Първо трябва да инсталирате subversion за Windows. За тази цел изтеглете " -"двоичния файл" +" Първо трябва да инсталирате subversion за „Уиндоус“. За тази цел " +"изтеглете двоичния файл" #: downloads.php:178 msgid "" @@ -662,8 +655,8 @@ "them in an MS-DOS command line and you're done." msgstr "" " След като сте инсталирали subversion, командите са същите, както и под " -"GNU/Linux. Единствената разлика е, че вместо launch.sh стартирате launch." -"bat. Въведете ги в командния ред на допотопния MS-DOS Prompt и сте готови." +"GNU/Линукс. Единствената разлика е, че вместо launch.sh стартирате launch." +"bat. Въведете ги в командния ред на допотопния „MS-DOS Prompt“ и сте готови." #: downloads.php:180 msgid " You can also use a graphical program like" @@ -679,21 +672,19 @@ #: downloads.php:182 msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" -msgstr "" +msgstr "(версия1 2.10.x или по-нова, версия на PyGTK < 2.10 е достъпна" #: downloads.php:182 -#, fuzzy msgid "(Version 2.4 or higher, 2.5 is recommended)," -msgstr "(за предпочитане версия 2.4.x), " +msgstr "(версия 2.4 или по-нова, препоръчва се 2.5)," #: downloads.php:182 -#, fuzzy msgid "" "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " "gimp-win.sf.net will NOT work (libglade is missing)," msgstr "" -"(версия 2.6.x или по-нова) ЗАБЕЛЕЖКА: GTK+ Runtime от gimp-win.sf.net НЯМА " -"да работи (липсва libglade)," +"(версия 2.6.x или по-нова, препоръчва се 2.10.x) ЗАБЕЛЕЖКА: Библиотеката GTK" +"+ от gimp-win.sf.net НЯМА да работи (липсва libglade)," #: downloads.php:182 msgid "GTK Runtime Environment" @@ -701,7 +692,7 @@ #: downloads.php:182 msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" -msgstr "" +msgstr "PyGTK за Уиндоус (PyGTK с pycairo и pygobject)" #: downloads.php:182 msgid "and at last" @@ -709,7 +700,7 @@ #: downloads.php:182 msgid "by Mark Hammond." -msgstr "от Mark Hammond." +msgstr "от Марк Хамънд." #: downloads.php:187 msgid " Daily Snapshots\n" @@ -741,25 +732,23 @@ msgstr "Здравейте и добре дошли на уеб-страницата на проекта Gajim" #: index.php:14 -#, fuzzy msgid "" "The goal of Gajim is to provide a full featured and easy to use Jabber " "client. Gajim works nicely with GNOME, but does not require it to run. It is " "released under the GNU General Public License. If you find bugs or have " "ideas how Gajim can be better please send tickets" msgstr "" -"Gajim е Jabber клиент, написан на PyGTK. Целта на разработчиците на Gajim е " -"да се предостави лесен за употреба xmpp клиент с много възможности за " -"потребителите на GTK+. Gajim не изисква GNOME, въпреки че прекрасно се " -"интегрира с тази среда. Gajim се разпространява под Общия публичен лиценз на " -"GNU (GPL)" +"Целта на Gajim е да се предостави лесен за употреба Джабър клиент с много " +"възможности. Gajim работи много добре с GNOME, но но тази среда не е " +"необходима, за да използвате програмата. Gajim се разпространява под Общия " +"публичен лиценз на GNU (GNU General Public License — GPL). Ако откриете " +"грешки или имате идеи как Gajim може да стане по-добър, моля изпратете билети" #: index.php:22 msgid "FEATURES:" msgstr "ВЪЗМОЖНОСТИ:" #: index.php:24 -#, fuzzy msgid "Tabbed chat window" msgstr "Прозорци за разговор с подпрозорци" @@ -768,18 +757,18 @@ msgstr "Поддръжка на стаи (с протокола MUC)" #: index.php:26 -#, fuzzy msgid "Emoticons, Avatars, File transfer, Room Bookmarks" -msgstr "Емотикони, аватари, файлов трансфер, прихващане на URL, отметки" +msgstr "Емотикони, аватари, файлов трансфер, отметки за стаи" #: index.php:27 -#, fuzzy msgid "Metacontacts Support" -msgstr "Поддръжка на много акаунти" +msgstr "Поддръжка на мета-контакти" #: index.php:28 msgid "Trayicon, Speller, extented chat history functionalities" msgstr "" +"Икона в областта за уведомяване, проверка на правописа, разширени " +"възможности за история на разговорите" #: index.php:29 msgid "TLS and GPG support (with SSL legacy support)" @@ -820,25 +809,26 @@ "French, German, Greek, Italian, Norwegian (Bokmål), Polish, Portugese, " "Russian, Spanish, Slovak and Swedish" msgstr "" +"Gajim е достъпен на 22 езика: баски, белоруски, бразилски португалски, " +"бретонски, български, китайски (опростен), хърватски, чешки, холандски, " +"английски, есперанто, френски, немски, гръцки, италиански, норвежки " +"(Bokmål), полски, португалски, руски, испански, словашки и шведски" #: index.php:46 msgid "NEWS" msgstr "НОВИНИ" #: index.php:49 -#, fuzzy msgid "Gajim 0.11 is here!" -msgstr "Излезе Gajim 0.9.1!" +msgstr "Излезе Gajim 0.11!" #: index.php:51 -#, fuzzy msgid "19 December 2006" -msgstr "27 декември 2005 г." +msgstr "19 декември 2006 г." #: index.php:53 -#, fuzzy msgid "Version 0.11 of Gajim has been released." -msgstr "Издадена е версия 0.9.1 на Gajim." +msgstr "Издадена е версия 0.11 на Gajim." #: index.php:55 msgid "What's new since " @@ -847,249 +837,138 @@ #: index.php:58 msgid "Support for link-local messaging via Zeroconf using Avahi" msgstr "" +"Поддръжка за локални съобщения (link-local messaging) чрез Zeroconf и Avahi" #: index.php:59 msgid "Support for Network Manager" -msgstr "" +msgstr "Поддръжка за NetworkManager" #: index.php:60 msgid "IPv6 support to connect to server" -msgstr "" +msgstr "Поддръжка на IPv6 при свързване със сървър" #: index.php:61 msgid "XHTML Support" -msgstr "" +msgstr "Поддръжка на XHTML" #: index.php:62 msgid "Privacy Lists support" -msgstr "" +msgstr "Поддръжка на списъци за уединение" #: index.php:63 msgid "Ad-Hoc commands" -msgstr "" +msgstr "Специални команди" #: index.php:64 msgid "GNOME Keyring support" -msgstr "" +msgstr "Поддръжка за набори ключове на GNOME" #: index.php:65 msgid "Full ChangeLog" -msgstr "" +msgstr "Пълен дневник на промените" #: index.php:66 msgid "Bugs/Annoyances closed" -msgstr "" +msgstr "Коригирани грешки и други неприятности" #: index.php:70 msgid "One Messages Window ability (default to it) with tab reorder ability" msgstr "" +"Възможност за разговори в един прозорец (по подразбиране) с преподреждане на " +"подпрозорците" #: index.php:71 msgid "Gajim no longer remains unresponsive" -msgstr "" +msgstr "Gajim вече не остава неотзивчив" #: index.php:72 msgid "Gajim now uses less memory" -msgstr "" +msgstr "Gajim вече използва по-малко памет" #: index.php:73 msgid "File Transfer works better (now should work out of the box for all)" -msgstr "" +msgstr "Файловият трансфер работи по-добре (зависимости между контактите)" #: index.php:74 msgid "Meta Contacts ability (relationships between contacts)" -msgstr "" +msgstr "Възможност за мета-контакти (зависимости между контактите)" #: index.php:75 msgid "" "Support for legacy composing event (JEP-0022). Now 'Contact is composing a " "message' will always work" msgstr "" +"Поддръжка за вече излязлото от употреба събитие за писане на съобщение (JEP-" +"0022). Сега „Контактът пише съобщение“ винаги ще работи" #: index.php:76 msgid "Gajim now defaults to theme that uses GTK colors" -msgstr "" +msgstr "Gajim вече по подразбиране използва тема с цветовете на GTK" #: index.php:77 msgid "" "Roster Management Improvements (f.e. editablity of transport names, extended " "Drag and Drop Functionality)" msgstr "" +"Подобрения по управлението на списъка (напр. редактиране на имената на " +"транспортите, разширена функционалност за провлачване и пускане)" #: index.php:78 msgid "History (chat logs) Manager (search globally, delete, etc)" msgstr "" +"Мениджър на историята (дневници на разговорите) -- глобално търсене, " +"изтриване и т.н." #: index.php:79 msgid "Animated Emoticons ability" -msgstr "" +msgstr "Възможност за анимирани емотикони" #: index.php:80 msgid "Support for GTalk email notifications for GMail" -msgstr "" +msgstr "Поддръжка за уведомления чрез GTalk за писма от Gmail" #: index.php:81 msgid "Room administrators can modify room ban list" -msgstr "" +msgstr "Администраторите на стаи могат да променят списъка с отлъчените" #: index.php:82 msgid "" "Gajim no longer optionally depends on pydns or dnspython. Requires dnsutils " "(or whatever package provides the nslookup binary)" msgstr "" +"Gajim вече не зависи от pydns или dnspython като опция. Изисква dnsutils " +"(или който и да е пакет, който осигурява изпълнимия файл nslookup)" #: index.php:83 msgid "gajim-remote has extended functionality" -msgstr "" +msgstr "gajim-remote има разширена функционалност" #: index.php:84 msgid "Improved Preset Status Messages Experience" -msgstr "" +msgstr "Подобрена работа с пренастроените съобщения за състояние" #: index.php:85 msgid "Detection for CRUX as user's operating system" -msgstr "" +msgstr "Разпознаване на CRUX като операционна система на потребителя" #: index.php:86 msgid "New art included, appropriate sizes of icons used where available" msgstr "" +"Включени са нови изображения и звуци, използват се подходящите размери на " +"иконите, когато са налични" #: index.php:87 msgid "Translations under Windows now work okay" -msgstr "" +msgstr "Преводите под „Уиндоус“ вече се изобразяват" #: index.php:88 msgid "Tons of fixes" -msgstr "" +msgstr "Тонове корекции" #: index.php:88 msgid "for bugs and annoyances." -msgstr "" +msgstr "на грешки и неприятности." #: screenshots.php:11 msgid "Here are some screenshots of Gajim:" msgstr "Ето и някои снимки на Gajim:" - -#, fuzzy -#~ msgid "Here" -#~ msgstr "тук" - -#, fuzzy -#~ msgid " You can get the Slackware package of Gajim" -#~ msgstr " Може да изтеглите autopackage " - -#~ msgid " You can download the autopackage " -#~ msgstr " Може да изтеглите autopackage " - -#~ msgid "To use it: make it executable, run it and follow the instructions.\n" -#~ msgstr "" -#~ "За да го използвате, направете го изпълним, стартирайте го и следвайте " -#~ "инструкциите.\n" - -#~ msgid "(Version 2.6.x or up)," -#~ msgstr "(препоръчва се версия 2.6.x или по-нова)," - -#~ msgid "PyGTK for Windows" -#~ msgstr "PyGTK за Windows" - -#~ msgid "" -#~ "Gajim is available in 16 languages: English, French, German, Russian, " -#~ "Spanish, Polish, Dutch, Portugese, Greek, Bulgarian, Czech, Basque, " -#~ "Norwegian (Bokmål), Slovak, Italian and Swedish" -#~ msgstr "" -#~ "Gajim е преведен на 16 езика: английски, френски, немски, руски, " -#~ "испански, полски, холандски, португалски, гръцки, български, чешки, " -#~ "баски, норвежки (букмол), словашки, италиански и шведски" - -#, fuzzy -#~ msgid "Gajim 0.10 is here!" -#~ msgstr "Излезе Gajim 0.9.1!" - -#, fuzzy -#~ msgid "Version 0.10 of Gajim has been released." -#~ msgstr "Издадена е версия 0.9.1 на Gajim." - -#~ msgid "Systray icon, Speller" -#~ msgstr "Икона в областта за уведомяване, проверка на правописа" - -#~ msgid "Gajim 0.9 is here!" -#~ msgstr "Излезе Gajim 0.9!" - -#~ msgid "23 December 2005" -#~ msgstr "23 декември 2005 г." - -#~ msgid "Version 0.9 of Gajim has been released." -#~ msgstr "Издадена е версия 0.9 на Gajim." - -#~ msgid "Fix a bug when joining a group chat" -#~ msgstr "Коригирана е грешка при влизане в стая" - -#~ msgid "Fix a bug when starting Gajim" -#~ msgstr "Коригирана е грешка при стартиране на Gajim" - -#~ msgid "Avatars and status messages in roster window" -#~ msgstr "Аватари и съобщения за състояние в списъка с контакти" - -#~ msgid "Improved service discovery window" -#~ msgstr "Подобрен прозорец за откриване на услуги" - -#~ msgid "Emoticons selector, Cooler Popup Windows (notification-daemon). Read" -#~ msgstr "" -#~ "Избор на емотикони, по-готини изскачащи прозорци (notification-daemon). " -#~ "Прочетете" - -#~ msgid "in case you did not notice something different" -#~ msgstr "в случай, че не сте забелязали разлика" - -#~ msgid "Caching of Avatars, Less UI freezing" -#~ msgstr "" -#~ "Кеширане на аватари, по-малко „замръзване“ на потребителския интерфейс" - -#~ msgid "New Account creation wizard" -#~ msgstr "Нов помощник за създаване на нови акаунти" - -#~ msgid "Better History Window with searching capabilities" -#~ msgstr "По-добър прозорец за история с възможности за търсене" - -#~ msgid "" -#~ "Gajim now tries to reconnect to a jabber server if connection is lost" -#~ msgstr "" -#~ "Gajim вече се опитва да се свърже с jabber сървъра, ако връзката се " -#~ "разпадне" - -#~ msgid "Queue for all events (File Transfer, private messages, etc)" -#~ msgstr "Опашка за всички събития (файлов трансфер, лични съобщения и т.н.)" - -#~ msgid "" -#~ "A lot of new irc-like commands in group chat. Do for example /help invite" -#~ msgstr "" -#~ "Много нови, подобни на irc команди при разговор в стая. Напишете например " -#~ "„/help invite“" - -#~ msgid "X11 Session Management support" -#~ msgstr "Поддръжка на управление на сесиите на X11" - -#~ msgid "Gajim registers and handles xmpp: and xmpp:// (GNOME/gconfd only)" -#~ msgstr "Gajim регистрира и обработва xmpp: и xmpp:// (само GNOME/gconfd)" - -#~ msgid "" -#~ "Use pysqlite for conversation history. Automigration for old logs. For " -#~ "more information please" -#~ msgstr "" -#~ "Използване на pysqlite за конвертиране на историята. Автоматична миграция " -#~ "на старите журнали. За повече информация" - -#~ msgid "read this" -#~ msgstr "прочетете това" - -#~ msgid "Learn more" -#~ msgstr "Научете повече" - -#~ msgid "You can also migrate your psi logs to Gajim logs." -#~ msgstr "Може да мигрирате и журналите на Psi към Gajim." - -#~ msgid "New translations: Italian, Swedish, Slovak, Basque" -#~ msgstr "Нови преводи: италиански, шведски, словашки, баски" - -#~ msgid "Bugs closed for 0.9" -#~ msgstr "Коригирани грешки в 0.9"

1 0

[commit-gajim] r7743 - trunk/data/glade
by nk＠gajim.org 30 Dec '06

30 Dec '06

Author: nk Date: 2006-12-30 02:01:00 +0100 (Sat, 30 Dec 2006) New Revision: 7743 Modified: trunk/data/glade/profile_window.glade Log: More in profile window should not be expaned by default Modified: trunk/data/glade/profile_window.glade =================================================================== --- trunk/data/glade/profile_window.glade 2006-12-30 00:54:20 UTC (rev 7742) +++ trunk/data/glade/profile_window.glade 2006-12-30 01:01:00 UTC (rev 7743) @@ -16,7 +16,6 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> <signal name="key_press_event" handler="on_profile_window_key_press_event" last_modification_time="Fri, 08 Sep 2006 11:39:24 GMT"/> <signal name="destroy" handler="on_profile_window_destroy" last_modification_time="Fri, 08 Sep 2006 11:39:32 GMT"/> @@ -92,7 +91,7 @@ <widget class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="expanded">True</property> + <property name="expanded">False</property> <property name="spacing">0</property> <child>

1 0

[commit-gajim] r7742 - trunk/src/common
by nk＠gajim.org 30 Dec '06

30 Dec '06

Author: nk Date: 2006-12-30 01:54:20 +0100 (Sat, 30 Dec 2006) New Revision: 7742 Modified: trunk/src/common/idle.c trunk/src/common/sleepy.py Log: make idle detection work in Windows without C compilation stuff (use ctypes and do the call to user32.dll via python [py25 includes ctypes else get it externally]. an Xmas gift from to Yann for .11 wonderful release! Modified: trunk/src/common/idle.c =================================================================== --- trunk/src/common/idle.c 2006-12-30 00:53:02 UTC (rev 7741) +++ trunk/src/common/idle.c 2006-12-30 00:54:20 UTC (rev 7742) @@ -5,12 +5,8 @@ * * Copyright (C) 2003-2004 Yann Le Boulanger <asterix(a)lagaule.org> * Vincent Hanquez <tab(a)snarc.org> - * Copyright (C) 2005 Yann Le Boulanger <asterix(a)lagaule.org> - * Vincent Hanquez <tab(a)snarc.org> + * Copyright (C) 2005-2006 Yann Le Boulanger <asterix(a)lagaule.org> * Nikos Kouremenos <nkour(a)jabber.org> - * Dimitur Kirov <dkirov(a)gmail.com> - * Travis Shirk <travis(a)pobox.com> - * Norman Rasmussen <norman(a)rasmussen.co.za> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -26,19 +22,11 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/scrnsaver.h> -#else - #define _WIN32_WINNT 0x0500 - #include <windows.h> - #define EXPORT __declspec(dllexport) #endif #include <Python.h> -#ifdef _WIN32 - typedef BOOL (WINAPI *GETLASTINPUTINFO)(LASTINPUTINFO *); - static HMODULE g_user32 = NULL; - static GETLASTINPUTINFO g_GetLastInputInfo = NULL; -#else +#ifndef _WIN32 Display *display; #endif @@ -47,11 +35,6 @@ { #ifndef _WIN32 display = XOpenDisplay(NULL); -#else - g_user32 = LoadLibrary("user32.dll"); - if (g_user32) { - g_GetLastInputInfo = (GETLASTINPUTINFO)GetProcAddress(g_user32, "GetLastInputInfo"); - } #endif Py_INCREF(Py_None); return Py_None; @@ -62,8 +45,6 @@ #ifndef _WIN32 static XScreenSaverInfo *mit_info = NULL; int idle_time, event_base, error_base; -#else - int idle_time = 0; #endif #ifndef _WIN32 @@ -76,16 +57,6 @@ } else idle_time = 0; -#else - if (g_GetLastInputInfo != NULL) { - LASTINPUTINFO lii; - memset(&lii, 0, sizeof(lii)); - lii.cbSize = sizeof(lii); - if (g_GetLastInputInfo(&lii)) { - idle_time = lii.dwTime; - } - idle_time = (GetTickCount() - idle_time) / 1000; - } #endif return Py_BuildValue("i", idle_time); } @@ -94,9 +65,6 @@ { #ifndef _WIN32 XCloseDisplay(display); -#else - if (g_user32 != NULL) - FreeLibrary(g_user32); #endif Py_INCREF(Py_None); return Py_None; Modified: trunk/src/common/sleepy.py =================================================================== --- trunk/src/common/sleepy.py 2006-12-30 00:53:02 UTC (rev 7741) +++ trunk/src/common/sleepy.py 2006-12-30 00:54:20 UTC (rev 7742) @@ -6,12 +6,8 @@ ## ## Copyright (C) 2003-2004 Yann Le Boulanger <asterix(a)lagaule.org> ## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Le Boulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> +## Copyright (C) 2005-2006 Yann Le Boulanger <asterix(a)lagaule.org> ## Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published @@ -24,6 +20,7 @@ ## from common import gajim +import os STATE_UNKNOWN = 'OS probably not supported' @@ -33,13 +30,57 @@ SUPPORTED = True try: - import idle + if os.name == 'nt': + import ctypes + + GetTickCount = ctypes.windll.kernel32.GetTickCount + GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo + + class LASTINPUTINFO(ctypes.Structure): + _fields_ = [('cbSize', ctypes.c_uint), + ('dwTime', ctypes.c_uint)] + + lastInputInfo = LASTINPUTINFO() + lastInputInfo.cbSize = ctypes.sizeof(lastInputInfo) + + else: # unix + import idle except: gajim.log.debug('Unable to load idle module') SUPPORTED = False -class Sleepy: +class SleepyWindows: + def __init__(self, away_interval = 60, xa_interval = 120): + self.away_interval = away_interval + self.xa_interval = xa_interval + self.state = STATE_AWAKE # assume we are awake + def getIdleSec(self): + GetLastInputInfo(ctypes.byref(lastInputInfo)) + idleDelta = float(GetTickCount() - lastInputInfo.dwTime) / 1000 + return idleDelta + + def poll(self): + '''checks to see if we should change state''' + idleTime = self.getIdleSec() + + # xa is stronger than away so check for xa first + if idleTime > self.xa_interval: + self.state = STATE_XA + elif idleTime > self.away_interval: + self.state = STATE_AWAY + else: + self.state = STATE_AWAKE + return True + + def getState(self): + return self.state + + def setState(self, val): + self.state = val + +class SleepyUnix: + def __init__(self, away_interval = 60, xa_interval = 120): self.away_interval = away_interval self.xa_interval = xa_interval @@ -50,12 +91,15 @@ SUPPORTED = False self.state = STATE_UNKNOWN + def getIdleSec(self): + return idle.getIdleSec() + def poll(self): '''checks to see if we should change state''' if not SUPPORTED: return False - idleTime = idle.getIdleSec() + idleTime = self.getIdleSec() # xa is stronger than away so check for xa first if idleTime > self.xa_interval: @@ -69,5 +113,10 @@ def getState(self): return self.state - def setState(self,val): + def setState(self, val): self.state = val + +if os.name == 'nt': + Sleepy = SleepyWindows +else: + Sleepy = SleepyUnix

1 0

[commit-gajim] r7741 - trunk/src
by nk＠gajim.org 30 Dec '06

30 Dec '06

Author: nk Date: 2006-12-30 01:53:02 +0100 (Sat, 30 Dec 2006) New Revision: 7741 Modified: trunk/src/message_control.py Log: fix typo Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2006-12-29 21:23:24 UTC (rev 7740) +++ trunk/src/message_control.py 2006-12-30 00:53:02 UTC (rev 7741) @@ -55,7 +55,7 @@ def set_control_active(self, state): '''Called when the control becomes active (state is True) or inactive (state is False)''' - pass # Derived types MUST implement this method + pass # Derived classes MUST implement this method def allow_shutdown(self, method): '''Called to check is a control is allowed to shutdown.

1 0

[commit-gajim] r7740 - trunk/src
by asterix＠gajim.org 29 Dec '06

29 Dec '06

Author: asterix Date: 2006-12-29 22:23:24 +0100 (Fri, 29 Dec 2006) New Revision: 7740 Modified: trunk/src/roster_window.py Log: add missins var initialization. Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-12-29 18:39:33 UTC (rev 7739) +++ trunk/src/roster_window.py 2006-12-29 21:23:24 UTC (rev 7740) @@ -150,7 +150,7 @@ self.add_contact_to_roster(jid, account) iters = self.get_contact_iter(jid, account) path = self.tree.get_model().get_path(iters[0]) - if self.draging: + if self.dragging: # do not change selection while DND'ing return # popup == False so we show awaiting event in roster @@ -3117,7 +3117,7 @@ if popup: if not ctrl: self.new_chat(contact, account, resource = resource_for_chat) - if path and not self.draging: + if path and not self.dragging: # we curently see contact in our roster OR he # is not in the roster at all. # show and select his line in roster @@ -3923,10 +3923,10 @@ selection.set(selection.target, 8, data) def drag_begin(self, treeview, context): - self.draging = True + self.dragging = True def drag_end(self, treeview, context): - self.draging = False + self.dragging = False def on_drop_in_contact(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime): @@ -4414,6 +4414,7 @@ self.tree.connect('drag_end', self.drag_end) self.tree.connect('drag_data_get', self.drag_data_get_data) self.tree.connect('drag_data_received', self.drag_data_received_data) + self.dragging = False self.xml.signal_autoconnect(self) self.combobox_callback_active = True

1 0

[commit-gajim] r7739 - in trunk/src: . common
by asterix＠gajim.org 29 Dec '06

29 Dec '06

Author: asterix Date: 2006-12-29 19:39:33 +0100 (Fri, 29 Dec 2006) New Revision: 7739 Modified: trunk/src/common/config.py trunk/src/roster_window.py Log: add an ACE option to show or not number of online / total contacts. fixes #2811 Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-12-29 18:30:18 UTC (rev 7738) +++ trunk/src/common/config.py 2006-12-29 18:39:33 UTC (rev 7739) @@ -222,6 +222,7 @@ 'confirm_metacontacts': [ opt_str, '', _('Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog.')], 'enable_negative_priority': [ opt_bool, False, _('If True, you will be able to set a negative priority to your account in account modification window. BE CAREFULL, when you are logged in with a negative priority, you will NOT receive any message from your server.')], 'use_gnomekeyring': [opt_bool, True, _('If True, Gajim will use Gnome Keyring (if available) to store account passwords.')], + 'show_contacts_number': [opt_bool, True, _('If True, Gajim will show number of online and total contacts in account and group rows.')], } __options_per_key = { Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-12-29 18:30:18 UTC (rev 7738) +++ trunk/src/roster_window.py 2006-12-29 18:39:33 UTC (rev 7739) @@ -228,8 +228,9 @@ if not self.tree.row_expanded(path) and model.iter_has_child(iter): # account row not expanded account_name = '[%s]' % account_name - if gajim.account_is_connected(account) or (self.regroup and \ - gajim.get_number_of_connected_accounts()): + if (gajim.account_is_connected(account) or (self.regroup and \ + gajim.get_number_of_connected_accounts())) and gajim.config.get( + 'show_contacts_number'): nbr_on, nbr_total = gajim.contacts.get_nb_online_total_contacts( accounts = accounts) account_name += ' (%s/%s)' % (repr(nbr_on),repr(nbr_total)) @@ -389,11 +390,13 @@ accounts = [] else: accounts = [account] - nbr_on, nbr_total = gajim.contacts.get_nb_online_total_contacts( - accounts = accounts, groups = [group]) + text = group + if gajim.config.get('show_contacts_number'): + nbr_on, nbr_total = gajim.contacts.get_nb_online_total_contacts( + accounts = accounts, groups = [group]) + text += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) model = self.tree.get_model() - model.set_value(iter, 1 , gtkgui_helpers.escape_for_pango_markup( - '%s (%s/%s)' % (group, repr(nbr_on), repr(nbr_total)))) + model.set_value(iter, 1 , gtkgui_helpers.escape_for_pango_markup(text)) def add_to_not_in_the_roster(self, account, jid, nick = ''): ''' add jid to group "not in the roster", he MUST not be in roster yet,

1 0

[commit-gajim] r7738 - trunk/src/common
by asterix＠gajim.org 29 Dec '06

29 Dec '06

Author: asterix Date: 2006-12-29 19:30:18 +0100 (Fri, 29 Dec 2006) New Revision: 7738 Modified: trunk/src/common/config.py trunk/src/common/passwords.py Log: add an ACE option to disable the use of Gnome Keyring. fixes #2835 Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-12-29 17:41:13 UTC (rev 7737) +++ trunk/src/common/config.py 2006-12-29 18:30:18 UTC (rev 7738) @@ -221,6 +221,7 @@ 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl-Tab go to next composing tab when none is unread.')], 'confirm_metacontacts': [ opt_str, '', _('Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog.')], 'enable_negative_priority': [ opt_bool, False, _('If True, you will be able to set a negative priority to your account in account modification window. BE CAREFULL, when you are logged in with a negative priority, you will NOT receive any message from your server.')], + 'use_gnomekeyring': [opt_bool, True, _('If True, Gajim will use Gnome Keyring (if available) to store account passwords.')], } __options_per_key = { Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2006-12-29 17:41:13 UTC (rev 7737) +++ trunk/src/common/passwords.py 2006-12-29 18:30:18 UTC (rev 7738) @@ -18,17 +18,19 @@ from common import gajim -try: - import gnomekeyring -except ImportError: - USER_HAS_GNOMEKEYRING = False - USER_USES_GNOMEKEYRING = False -else: - USER_HAS_GNOMEKEYRING = True - if gnomekeyring.is_available(): - USER_USES_GNOMEKEYRING = True +USER_HAS_GNOMEKEYRING = False +USER_USES_GNOMEKEYRING = False +if gajim.config.get('use_gnomekeyring'): + try: + import gnomekeyring + except ImportError: + pass else: - USER_USES_GNOMEKEYRING = False + USER_HAS_GNOMEKEYRING = True + if gnomekeyring.is_available(): + USER_USES_GNOMEKEYRING = True + else: + USER_USES_GNOMEKEYRING = False class PasswordStorage(object): def get_password(self, account_name):

1 0

[commit-gajim] r7737 - trunk/src
by asterix＠gajim.org 29 Dec '06

29 Dec '06

Author: asterix Date: 2006-12-29 18:41:13 +0100 (Fri, 29 Dec 2006) New Revision: 7737 Modified: trunk/src/roster_window.py Log: don't change selection while Drag and Droping. fixes #2532 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-12-29 17:39:29 UTC (rev 7736) +++ trunk/src/roster_window.py 2006-12-29 17:41:13 UTC (rev 7737) @@ -150,8 +150,11 @@ self.add_contact_to_roster(jid, account) iters = self.get_contact_iter(jid, account) path = self.tree.get_model().get_path(iters[0]) + if self.draging: + # do not change selection while DND'ing + return # popup == False so we show awaiting event in roster - # show and select contact line in roster (even if he is not in roster) + # show and select contact line in roster (even if he is not in roster) self.tree.expand_row(path[0:1], False) self.tree.expand_row(path[0:2], False) self.tree.scroll_to_cell(path) @@ -3111,10 +3114,11 @@ if popup: if not ctrl: self.new_chat(contact, account, resource = resource_for_chat) - if path: + if path and not self.draging: # we curently see contact in our roster OR he # is not in the roster at all. # show and select his line in roster + # do not change selection while DND'ing self.tree.expand_row(path[0:1], False) self.tree.expand_row(path[0:2], False) self.tree.scroll_to_cell(path) @@ -3915,6 +3919,12 @@ data = model[path][C_JID] selection.set(selection.target, 8, data) + def drag_begin(self, treeview, context): + self.draging = True + + def drag_end(self, treeview, context): + self.draging = False + def on_drop_in_contact(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime): if not gajim.connections[account_source].metacontacts_supported or not \ @@ -4397,6 +4407,8 @@ self.tree.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, TARGETS, gtk.gdk.ACTION_DEFAULT | gtk.gdk.ACTION_MOVE | gtk.gdk.ACTION_COPY) self.tree.enable_model_drag_dest(TARGETS2, gtk.gdk.ACTION_DEFAULT) + self.tree.connect('drag_begin', self.drag_begin) + self.tree.connect('drag_end', self.drag_end) self.tree.connect('drag_data_get', self.drag_data_get_data) self.tree.connect('drag_data_received', self.drag_data_received_data) self.xml.signal_autoconnect(self)

1 0

[commit-gajim] r7736 - trunk/data/glade
by asterix＠gajim.org 29 Dec '06

29 Dec '06

Author: asterix Date: 2006-12-29 18:39:29 +0100 (Fri, 29 Dec 2006) New Revision: 7736 Modified: trunk/data/glade/passphrase_dialog.glade Log: wrap text in passphrase dialog Modified: trunk/data/glade/passphrase_dialog.glade =================================================================== --- trunk/data/glade/passphrase_dialog.glade 2006-12-29 07:32:18 UTC (rev 7735) +++ trunk/data/glade/passphrase_dialog.glade 2006-12-29 17:39:29 UTC (rev 7736) @@ -17,6 +17,7 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> <property name="has_separator">True</property> <child internal-child="vbox"> @@ -79,7 +80,7 @@ <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> + <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property>

1 0

[commit-gajim] r7735 - in trunk: data/glade src
by asterix＠gajim.org 29 Dec '06

29 Dec '06

Author: asterix Date: 2006-12-29 08:32:18 +0100 (Fri, 29 Dec 2006) New Revision: 7735 Modified: trunk/data/glade/profile_window.glade trunk/src/profile_window.py Log: remove publish / retrieve button in profile window. fixes #2471 Modified: trunk/data/glade/profile_window.glade =================================================================== --- trunk/data/glade/profile_window.glade 2006-12-29 01:46:46 UTC (rev 7734) +++ trunk/data/glade/profile_window.glade 2006-12-29 07:32:18 UTC (rev 7735) @@ -1856,165 +1856,28 @@ <property name="spacing">12</property> <child> - <widget class="GtkButton" id="publish_button"> + <widget class="GtkButton" id="cancel_button"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_publish_button_clicked"/> - - <child> - <widget class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-go-up</property> - <property name="icon_size">4</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Publish</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> + <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Fri, 29 Dec 2006 07:28:04 GMT"/> </widget> </child> <child> - <widget class="GtkButton" id="retrieve_button"> + <widget class="GtkButton" id="ok_button"> <property name="visible">True</property> <property name="can_default">True</property> <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_retrieve_button_clicked"/> - - <child> - <widget class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-go-down</property> - <property name="icon_size">4</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Retrieve</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> + <property name="label">gtk-ok</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Mon, 25 Sep 2006 04:58:43 GMT"/> + <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Fri, 29 Dec 2006 07:27:45 GMT"/> </widget> </child> </widget> Modified: trunk/src/profile_window.py =================================================================== --- trunk/src/profile_window.py 2006-12-29 01:46:46 UTC (rev 7734) +++ trunk/src/profile_window.py 2006-12-29 07:32:18 UTC (rev 7735) @@ -299,7 +299,7 @@ vcard['PHOTO']['TYPE'] = self.avatar_mime_type return vcard - def on_publish_button_clicked(self, widget): + def on_ok_button_clicked(self, widget): if self.update_progressbar_timeout_id: # Operation in progress return @@ -322,16 +322,11 @@ self.update_progressbar) def vcard_published(self): - if self.message_id: - self.statusbar.remove(self.context_id, self.message_id) - self.message_id = self.statusbar.push(self.context_id, - _('Information published')) - self.remove_statusbar_timeout_id = gobject.timeout_add(3000, - self.remove_statusbar, self.message_id) if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) self.progressbar.set_fraction(0) self.update_progressbar_timeout_id = None + self.window.destroy() def vcard_not_published(self): if self.message_id: @@ -348,34 +343,5 @@ _('There was an error while publishing your personal information, ' 'try again later.')) - def on_retrieve_button_clicked(self, widget): - if self.update_progressbar_timeout_id: - # Operation in progress - return - entries = ['FN', 'NICKNAME', 'BDAY', 'EMAIL_HOME_USERID', 'URL', - 'TEL_HOME_NUMBER', 'N_FAMILY', 'N_GIVEN', 'N_MIDDLE', 'N_PREFIX', - 'N_SUFFIX', 'ADR_HOME_STREET', 'ADR_HOME_EXTADR', 'ADR_HOME_LOCALITY', - 'ADR_HOME_REGION', 'ADR_HOME_PCODE', 'ADR_HOME_CTRY', 'ORG_ORGNAME', - 'ORG_ORGUNIT', 'TITLE', 'ROLE', 'ADR_WORK_STREET', 'ADR_WORK_EXTADR', - 'ADR_WORK_LOCALITY', 'ADR_WORK_REGION', 'ADR_WORK_PCODE', - 'ADR_WORK_CTRY'] - if gajim.connections[self.account].connected > 1: - # clear all entries - for e in entries: - self.xml.get_widget(e + '_entry').set_text('') - self.xml.get_widget('DESC_textview').get_buffer().set_text('') - button = self.xml.get_widget('PHOTO_button') - image = button.get_image() - image.set_from_pixbuf(None) - button.set_label(_('Click to set your avatar')) - gajim.connections[self.account].request_vcard(self.jid) - else: - dialogs.ErrorDialog(_('You are not connected to the server'), - _('Without a connection, you can not get your contact information.')) - self.message_id = self.statusbar.push(self.context_id, - _('Retrieving profile...')) - self.update_progressbar_timeout_id = gobject.timeout_add(100, - self.update_progressbar) - - def on_close_button_clicked(self, widget): + def on_cancel_button_clicked(self, widget): self.window.destroy()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2006