Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 4

psi+-iconsets.changes Changed

psi+-iconsets.spec Changed

@@ -16,14 +16,17 @@
 #
 
 
+%define version_unconverted 20160408
+
 Name:           psi+-iconsets
 Url:            http://code.google.com/p/psi-dev/
-Version:        20160309
+Version:        20160408
 Release:        0
 Summary:        Icons for Psi
 License:        GPL-2.0 and CC-BY-ND-3.0
 Group:          Productivity/Networking/Talk/Clients
-Requires:       psi+
+# only for psi+ with icons from upstream (otherwise some will be missing)
+Requires:       psi+ >= 20160408
 Source0:        psi-plus-main-%{version}.tar.xz
 Source1:        psi-plus-resources-1.tar.xz
 BuildArch:      noarch
@@ -40,7 +43,7 @@
 %install
 install -d -m 0755 %{buildroot}/%{iconspath}
 
-for DIR in activities/default affiliations/default clients/default moods/default; do
+for DIR in clients/default; do
 	DEST="%{buildroot}/%{iconspath}/$DIR/"
 	install -d -m 0755 "$DEST"
 	install -m 0644 -t "$DEST" iconsets/"$DIR"/icondef.xml
@@ -65,14 +68,11 @@
 %dir %{_datadir}/psi-plus
 %dir %{iconspath}
 %dir %{iconspath}/activities
-%dir %{iconspath}/activities/default
 %dir %{iconspath}/affiliations
-%dir %{iconspath}/affiliations/default
 %dir %{iconspath}/clients
 %dir %{iconspath}/clients/default
 %dir %{iconspath}/emoticons
 %dir %{iconspath}/moods
-%dir %{iconspath}/moods/default
 %dir %{iconspath}/roster
 %dir %{iconspath}/system
 %{iconspath}/activities/*.jisp
@@ -82,14 +82,8 @@
 %{iconspath}/moods/*.jisp
 %{iconspath}/roster/*.jisp
 %{iconspath}/system/*.jisp
-%{iconspath}/activities/default/icondef.xml
-%{iconspath}/affiliations/default/icondef.xml
 %{iconspath}/clients/default/icondef.xml
-%{iconspath}/moods/default/icondef.xml
 %{iconspath}/clients/default/FP_Freeware?License.txt
-%{iconspath}/activities/default/*.png
-%{iconspath}/affiliations/default/*.png
 %{iconspath}/clients/default/*.png
-%{iconspath}/moods/default/*.png
 
 %changelog

_service Changed

psi-plus-main-20160309.tar.xz/README Deleted

psi-plus-main-20160309.tar.xz/app.ico Deleted

psi-plus-main-20160309.tar.xz/changelog.txt Deleted

@@ -1,6767 +0,0 @@
-2014-05-02  zet
-v0.16.361
-  ! [коммит в upstream] psi: разрешено автозаполнение поля с паролем в форме присоединения
-    к конференции
-  ! [коммит в upstream] psi: исправлено некорректное поведение при перетаскивании объектов
-    в ростере конференции
-  ! [коммит в upstream] psi: исправлена работа поиска в ростере (задача 107,
-    https://github.com/psi-im/psi/issues/107)
-  ! [коммит в upstream] psi: сворачивание/разворачивание групп ростера при одиночном клике на
-    иконке группы
-  ! [коммит в upstream] psi: более эффективная работа с опциями
-  ! [коммит в upstream] psi: некоторые улучшения при перерисовке элементов ростера
-  ! [коммит в upstream] psi: небольшие исправления для диалоговых окон с историей переписки
-    (задача 109, https://github.com/psi-im/psi/issues/109 и другие)
-  ! [коммит в upstream] psi: решена задача 108, https://github.com/psi-im/psi/issues/108
-  ! [коммит в upstream] psi: 2014 год в окне "О программе"
-  ! [коммит в upstream] psi: попытка исправить некорректное отображение иконки в трее
-  ! [коммит в upstream] psi: решена задача 102, https://github.com/psi-im/psi/issues/102
-  ! [коммит в upstream] psi: всегда отображать в ростере контакт с непрочитанным сообщением/событием
-    (https://github.com/psi-im/psi/issues/42)
-  ! [коммит в upstream] psi: исправлена ошибка при смене ника после кика в конференции
-  ! [коммит в upstream] psi: сглаживание шрифтов в WebKit-версии
-  ! [коммит в upstream] psi: фикс получения имени клиента в случае когда в капсах содержится 'https'
-  ! [коммит в upstream] psi: теперь используется внешний qjdns
-  ! [коммит в upstream] psi: возможность сделать масштабируемую область видеоокна для видеозвонков
-  ! [коммит в upstream] psi: показывать продолжительность вызова в строке состояния
-  ! [коммит в upstream] iris: добавлен qcm-модуль для проверки наличия внешнего qjdns. если внешний
-    qjdns не найден, то будет использоваться встроенная версия. также встроенная версии qjdns будет
-    использоваться в Windows и в Mac OS X без проверки наличия внешнего qjdns
-  + добавлен новый патч для решения задачи 524, https://code.google.com/p/psi-dev/issues/detail?id=524
-    (psi-fix-selection-behavior-groupchat-dlg.diff)
-  + добавлен новый патч для решения задачи 574, https://code.google.com/p/psi-dev/issues/detail?id=574
-    (fix-muc-roster-drag-and-drop.diff)
-  - убран патч fix-muc-roster-drag-and-drop.diff -> принят в upstream
-  + добавлен новый патч для поддержки проверки правописания при использовании нескольких словарей
-    в случае когда Psi+ скомпилирован с enchant (psi-enchant-multidicts.diff)
-  + добавлен новый патч для решения задачи 575, https://code.google.com/p/psi-dev/issues/detail?id=575
-    для работы фичи необходимо опцию "options.ui.muc.allow-highlight-events" установить в положение
-    "true" (psi-muc-highlight-events.diff)
-  * исправлена утечка памяти при очистке очереди событий. память текла при удалении контакта, если у
-    него были непрочитанные сообщения или другие необработанные события (psi-fix-memory-leaks.diff)
-  * исправлена ошибка, в результате которой отображалось событие composing для конференций
-    (если какой нибудь клиент его отправлял), также теперь используется одинаковая иконка
-    для события и для чатов (psi-muc-highlight-events.diff)
-  * решена проблема с повреждением открытых вкладок, содержащих приватные чаты конференций,
-    при появлении нового события для конференции. ник и заголовок вкладки приватного чата менялись
-    на название конференции (psi-muc-highlight-events.diff)
-  * теперь события конференции подгружаются при запуске Psi+ (если таковые существуют)
-    [psi-muc-highlight-events.diff]
-  - убраны патчи psi-more-effective-work-with-options.diff и
-    some-improvments-for-contactlist-repaiting.diff -> приняты в upstream
-  * попытка исправить патч psi-improve-tray-tooltip.diff
-  * обновлён патч psi-hide-any-group.diff
-  * решена задача 578, https://code.google.com/p/psi-dev/issues/detail?id=578
-    (psi-reasons-for-roles-affiliations.diff)
-  + добавлен новый патч psi-disable-messages-correct-behavior.diff: патч меняет поведение опции
-    "options.message.enabled". теперь при включённой опции входящие сообщения и другие события
-    отображаются в диалоге, события не "зависают". исходящие сообщения запрещены и отключены в меню.
-    также решена задача 560, https://code.google.com/p/psi-dev/issues/detail?id=560
-  + добавлен новый патч psi-transfer-dlg-improvement.diff: доработка диалогового окна передачи файлов,
-    подробнее https://github.com/psi-plus/main/commit/1d5659b572e5a5dae39a245a66b5c71553adfa67#commitcomment-5454136
-  + добавлены новые патчи для ОС Haiku (спасибо Diger) [fix-psiplus-build-in-haiku.patch,
-    fix-iconselect-buttons-in-haiku.patch, fix-screenshotplugin-build-in-haiku.patch]
-  * добавлены новые капсы и ресурсы для Jabber-клиентов из списка отсюда:
-    https://code.google.com/p/psi-dev/issues/detail?id=3#c157 (спасибо aon17@mail.ru)
-    [psi-client-icons.diff]
-  * обновлены наборы иконок Jabber-клиентов "fingerprint.jisp" и "fingerprint-22.jisp"
-    (спасибо aon17@mail.ru)
-  * добавлена поддержка действия detach при клике средней кнопкой мыши по табу. для неизвестных
-    значений настройки теперь используется действие по умолчанию "none" (спасибо Hamper)
-    [psi-tab-action-on-mouse-click.diff]
-  * исправлена недоработка, в результате которой в консоль выводились предупреждения
-    об отсутствующей опции (задача 563, пункт 0) [psi-tunable-chattoolbar.diff]
-  * исправлено поведение при выделении элементов в обычных чатах. теперь это происходит таким же
-    способом, как и в MUC (https://code.google.com/p/psi-dev/issues/detail?id=524)
-    [psi-fix-selection-behavior-chat-dlg.diff]
-  * убраны ненужные переменные в патчах psi-modern-roster.diff и psi-options-reset-button.diff
-  * добавлена проверка на пустые аватары в патче psi-roster-avatar-frame.diff
-  * чистка лишних отладочных сообщений в коде для решения задачи 563,
-    https://code.google.com/p/psi-dev/issues/detail?id=563 (psi-extend-plugins-interface.diff)
-  * теперь центральная панель инструментов в чатах включена по умолчанию
-    (psi-default-application-settings.diff, psi-tunable-chattoolbar.diff)
-  * решена проблема, описанная здесь: http://code.google.com/p/psi-dev/issues/detail?id=106#c35.
-    теперь в диалоге чата, запущенном по команде из контекстного меню, будет выбран правильный
-    ресурс. если ресурс у контакта только один, то режим autojid останется включённым. если
-    несколько ресурсов - то даже, если был выбран ресурс с максимальным приоритетом, этот режим
-    будет отключён (psi-one-chat-for-many-resources.diff)
-  * исправлен двойной вызов vcard из контекстного меню при клике на jid в ростере
-    (psi-muc-nickclick-chat.diff)
-  * исправлен регистр в названиях ресурсов, т.к. для данного патча в переменной name не может быть
-    символов верхнего регистра (psi-client-icons.diff)
-  * обновлена ссылка для скачивания свежего инсталлятора Psi+, а также обновлены прямые ссылки на
-    changelog и version в патче на автоматическое обнаружение новых версий Psi+
-    (psi-dirty-check.diff)
-  * обновлён OTR plugin до версии 1.0.2,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/otrplugin/changelog.txt
-  * обновлён extended menu plugin до версии 0.1.3,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedmenuplugin/changelog.txt
-  * обновлён video status plugin до версии 0.2.5,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/videostatusplugin/changelog.txt
-  * обновлён extended options plugin до версии 0.4.0,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedoptionsplugin/changelog.txt
-  * обновлён content downloader plugin до версии 0.2.5,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/contentdownloaderplugin/changelog.txt
-  ! обновлены библиотеки шифрования OpenSSL до версии 1.0.1g,
-    http://www.openssl.org/news/changelog.html
-  ! обновлены файлы локализации для поддержки различных языков в Psi+ (версия локализации 0.16.352)
-    https://github.com/psi-plus/psi-plus-l10n
-  --
-  ! [upstream commit] psi: allowed autofill password for muc join dialog
-  ! [upstream commit] psi: fixed drag and drop action in the muc roster
-  ! [upstream commit] psi: fix search in roster (https://github.com/psi-im/psi/issues/107)
-  ! [upstream commit] psi: expand/collapse roster groups on group icon singleclick
-  ! [upstream commit] psi: more effenctive work with options
-  ! [upstream commit] psi: some improvements for contactlist repainting
-  ! [upstream commit] psi: some fixes for history
-    (https://github.com/psi-im/psi/issues/109 and other)
-  ! [upstream commit] psi: fixed https://github.com/psi-im/psi/issues/108
-  ! [upstream commit] psi: 2014 at aboutdlg
-  ! [upstream commit] psi: try to fix wrong tray icon
-  ! [upstream commit] psi: fix handling + at url (https://github.com/psi-im/psi/issues/102)
-  ! [upstream commit] psi: always show contacts with events
-    (https://github.com/psi-im/psi/issues/42)
-  ! [upstream commit] psi: fix nick changing after kick from muc
-  ! [upstream commit] psi: round pixel font size in WebKit
-  ! [upstream commit] psi: fixed to obtain the client's name, if the caps node contains https
-  ! [upstream commit] psi: use external qjdns
-  ! [upstream commit] psi: make scalable video area for video calls
-  ! [upstream commit] psi: show call duration in status string
-  ! [upstream commit] iris: added qcm module to check for external qjdns. if external qjdns not
-    found will be used bundled version. also bundled qjdns will be used on Windows and Mac OS X
-    without checking for external qjdns
-  + added new psi-fix-selection-behavior-groupchat-dlg.diff patch
-  + added new patch for fix issue 574, https://code.google.com/p/psi-dev/issues/detail?id=574
-    (fix-muc-roster-drag-and-drop.diff)
-  - removed fix-muc-roster-drag-and-drop.diff patch -> went to upstream
-  + added new patch for support check spelling with multiple dictionaries when Psi+ compiled with
-    enchant (psi-enchant-multidicts.diff)
-  + added new patch for fix issue 575, https://code.google.com/p/psi-dev/issues/detail?id=575. for
-    enable this feature you need 'options.ui.muc.allow-highlight-events' option switch to 'true'
-    position (psi-muc-highlight-events.diff)
-  * fixed a memory leak (psi-fix-memory-leaks.diff)
-  * updated psi-muc-highlight-events.diff patch
-  - removed psi-more-effective-work-with-options.diff and
-    some-improvments-for-contactlist-repaiting.diff patches -> went to upstream
-  * try to fix psi-improve-tray-tooltip.diff patch
-  * updated psi-hide-any-group.diff patch
-  * fixed issue 578, https://code.google.com/p/psi-dev/issues/detail?id=578
-    (psi-reasons-for-roles-affiliations.diff)
-  + added new psi-disable-messages-correct-behavior.diff patch
-  + added new psi-transfer-dlg-improvement.diff patch
-  + added patches for Haiku (thanks to Diger) [fix-psiplus-build-in-haiku.patch,
-    fix-iconselect-buttons-in-haiku.patch, fix-screenshotplugin-build-in-haiku.patch]
-  * added new client caps and resources to src/userlist.cpp from
-    https://code.google.com/p/psi-dev/issues/detail?id=3#c157 (thanks to aon17@mail.ru)
-    [psi-client-icons.diff]
-  * updated client iconsets 'fingerprint.jisp' and 'fingerprint-22.jisp' (thanks to aon17@mail.ru)
-  * added some actions on the mouse middle button (thanks to Hamper)
-    [psi-tab-action-on-mouse-click.diff]
-  * updated psi-tunable-chattoolbar.diff patch
-  * fixed a selection behavior in the psichatdlg (psi-fix-selection-behavior-chat-dlg.diff)
-  * removed unused variables in psi-modern-roster.diff and psi-options-reset-button.diff patches
-  * updated psi-roster-avatar-frame.diff patch
-  * updated psi-extend-plugins-interface.diff patch for fix issue 563,
-    https://code.google.com/p/psi-dev/issues/detail?id=563
-  * enable central toolbar by default
-    (psi-default-application-settings.diff, psi-tunable-chattoolbar.diff)
-  * updated psi-one-chat-for-many-resources.diff patch
-  * fixed double vcards from context menu on jid (psi-muc-nickclick-chat.diff)
-  * fixed capital letters in comparisions in psi-client-icons.diff patch
-  * updated downloads location and changelog/version raw files locations for auto updater
-    (psi-dirty-check.diff)
-  * updated OTR plugin to v1.0.2,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/otrplugin/changelog.txt
-  * updated extended menu plugin to v0.1.3,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedmenuplugin/changelog.txt
-  * updated video status plugin to v0.2.5,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/videostatusplugin/changelog.txt
-  * updated extended options plugin to v0.4.0,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/extendedoptionsplugin/changelog.txt
-  * updated content downloader plugin to v0.2.5,
-    https://raw.githubusercontent.com/psi-plus/plugins/master/generic/contentdownloaderplugin/changelog.txt
-  ! updated OpenSSL win32 binary files to v1.0.1g, http://www.openssl.org/news/changelog.html
-  ! updated translations to v0.16.355 (https://github.com/psi-plus/psi-plus-l10n)
-
-
-2013-11-24  zet
-v0.16.261
-  ! [коммит в upstream] psi: dbus отключён в MS Windows по умолчанию
-  ! [коммит в upstream] psi: теперь не показывается лишняя история сообщений при перезаходе в
-    конференцию (спасибо Dmitriy Deshevoy)
-  ! [коммит в upstream] psi: исправлен порядок расположения панелей инструментов в настройках
-    приложения. Теперь новые панели появляются всегда в конце списка (снизу)
-  ! [коммит в upstream] psi: улучшена раскраска ников в чатлоге конференции. Патч от команды Psi+
-  ! [коммит в upstream] psi: исправлено падение приложения при вызове AlertManager
-  ! [коммит в upstream] psi: улучшено определение версии ОС семейства MS Windows в SystemInfo
-  + добавлен новый патч psi-tunable-chattoolbar.diff
-  * теперь используется слово "Groupchat" вместо "MUC"  или "Conference"
-    (psi-muc-and-user-topic-context-menu.diff)

psi-plus-main-20160309.tar.xz/copying-psi.txt Deleted

@@ -1,296 +0,0 @@
-
-  As a special exception, the copyright holder(s) give permission to link
-  this program with the Qt Library (commercial or non-commercial edition),
-  and distribute the resulting executable, without including the source
-  code for the Qt library in the source distribution.
-
-  As a special exception, the copyright holder(s) give permission to link
-  this program with any other library, and distribute the resulting
-  executable, without including the source code for the library in the
-  source distribution, provided that the library interfaces with this
-  program only via the following plugin interfaces:
-
-    1. The Qt Plugin APIs, only as authored by Trolltech
-    2. The QCA Plugin API, only as authored by Justin Karneges
-
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-&#xc;
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-&#xc;
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-&#xc;
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by

psi-plus-main-20160309.tar.xz/copying.txt Deleted

@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-&#xc;
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-&#xc;
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-&#xc;
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.

psi-plus-main-20160309.tar.xz/iconsets/activities Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_buying_groceries.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_cleaning.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_cooking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_doing_maintenance.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_doing_the_dishes.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_doing_the_laundry.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_gardening.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_running_an_errand.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/doing_chores_walking_the_dog.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/drinking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/drinking_having_a_beer.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/drinking_having_coffee.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/drinking_having_tea.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/eating.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/eating_having_a_snack.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/eating_having_breakfast.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/eating_having_dinner.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/eating_having_lunch.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_cycling.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_dancing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_hiking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_jogging.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_playing_sports.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_running.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_skiing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_swimming.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/exercising_working_out.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_at_the_spa.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_brushing_teeth.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_getting_a_haircut.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_shaving.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_taking_a_bath.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/grooming_taking_a_shower.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/having_appointment.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/icondef.xml Deleted

@@ -1,432 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<icondef>                                                         
-        <meta>                                                    
-                <name>Psi+ Activities - size 16</name>
-                <version>0.3</version>
-                <creation>2010-07-18</creation>
-                <home>http://psi-dev.googlecode.com/</home>
-                <author email='tuxden@ru.ru'>tux-den</author>
-                <author email='maksim.maj@gmail.com'>maj</author>
-                <description>Activities iconset for Psi+ IM</description>
-           </meta>
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores</x>
-                <object mime='image/png'>doing_chores.png</object>
-        </icon>                                                 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_buying_groceries</x>
-                <object mime='image/png'>doing_chores_buying_groceries.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_cleaning</x>
-                <object mime='image/png'>doing_chores_cleaning.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_cooking</x>
-                <object mime='image/png'>doing_chores_cooking.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_doing_maintenance</x>
-                <object mime='image/png'>doing_chores_doing_maintenance.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_doing_the_dishes</x>
-                <object mime='image/png'>doing_chores_doing_the_dishes.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_doing_the_laundry</x>
-                <object mime='image/png'>doing_chores_doing_the_laundry.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_gardening</x>
-                <object mime='image/png'>doing_chores_gardening.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_running_an_errand</x>
-                <object mime='image/png'>doing_chores_running_an_errand.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/doing_chores_walking_the_dog</x>
-                <object mime='image/png'>doing_chores_walking_the_dog.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/drinking</x>
-                <object mime='image/png'>drinking.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/drinking_having_a_beer</x>
-                <object mime='image/png'>drinking_having_a_beer.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/drinking_having_coffee</x>
-                <object mime='image/png'>drinking_having_coffee.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/drinking_having_tea</x>
-                <object mime='image/png'>drinking_having_tea.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/eating</x>
-                <object mime='image/png'>eating.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/eating_having_a_snack</x>
-                <object mime='image/png'>eating_having_a_snack.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/eating_having_breakfast</x>
-                <object mime='image/png'>eating_having_breakfast.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/eating_having_dinner</x>
-                <object mime='image/png'>eating_having_dinner.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/eating_having_lunch</x>
-                <object mime='image/png'>eating_having_lunch.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/exercising</x>
-                <object mime='image/png'>exercising.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_cycling</x>
-                <object mime='image/png'>exercising_cycling.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_dancing</x>
-                <object mime='image/png'>exercising_dancing.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_hiking</x>
-                <object mime='image/png'>exercising_hiking.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_jogging</x>
-                <object mime='image/png'>exercising_jogging.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_playing_sports</x>
-                <object mime='image/png'>exercising_playing_sports.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_running</x>
-                <object mime='image/png'>exercising_running.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_skiing</x>
-                <object mime='image/png'>exercising_skiing.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_swimming</x>
-                <object mime='image/png'>exercising_swimming.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/exercising_working_out</x>
-                <object mime='image/png'>exercising_working_out.png</object>
-        </icon> 
-
-	
-
-        <icon>
-                <x xmlns='name'>activities/grooming</x>
-                <object mime='image/png'>grooming.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_at_the_spa</x>
-                <object mime='image/png'>grooming_at_the_spa.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_brushing_teeth</x>
-                <object mime='image/png'>grooming_brushing_teeth.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_getting_a_haircut</x>
-                <object mime='image/png'>grooming_getting_a_haircut.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_shaving</x>
-                <object mime='image/png'>grooming_shaving.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_taking_a_bath</x>
-                <object mime='image/png'>grooming_taking_a_bath.png</object>
-        </icon> 
-
-        <icon>
-                <x xmlns='name'>activities/grooming_taking_a_shower</x>

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_day_off.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_hanging_out.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_hiding.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_on_vacation.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_praying.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_scheduled_holiday.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_sleeping.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/inactive_thinking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_fishing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_gaming.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_going_out.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_partying.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_reading.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_rehearsing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_shopping.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_smoking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_socializing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_sunbathing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_watching_a_movie.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/relaxing_watching_tv.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/talking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/talking_in_real_life.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/talking_on_the_phone.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/talking_on_video_phone.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_commuting.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_cycling.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_driving.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_in_a_car.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_on_a_bus.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_on_a_plane.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_on_a_train.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_on_a_trip.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/traveling_walking.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/unknown.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/working_coding.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/working_in_a_meeting.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/working_studying.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/working_working.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/activities/default/working_writing.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/admin.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/icondef.xml Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/member.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/noaffiliation.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/outcast.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/affiliations/default/owner.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Afraid.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Amazed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Amorous.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Angry.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Annoyed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Anxious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Aroused.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Ashamed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Bored.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Brave.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Calm.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Cautious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Cold.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Confident.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Confused.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Contemplative.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Contented.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Cranky.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Crazy.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Creative.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Curious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Dejected.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Depressed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Disappointed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Disgusted.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Dismayed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Distracted.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Embarrassed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Envious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Excited.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Flirtatious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Frustrated.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Grumpy.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Guilty.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Happy.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Hopeful.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Hot.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Humbled.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Humiliated.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Hungry.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Hurt.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Impressed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/In_awe.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/In_love.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Indignant.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Interested.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Intoxicated.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Invincible.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Jealous.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Lonely.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Lucky.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Mean.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Moody.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Nervous.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Neutral.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Offended.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Outraged.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Playful.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Proud.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Readme.txt Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Relaxed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Relieved.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Remorseful.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Restless.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Sad.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Sarcastic.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Serious.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Shocked.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Shy.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Sick.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Sleepy.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Spontaneous.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Stressed.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Strong.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Surprised.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Thankful.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Thirsty.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Tired.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Undefined.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Weak.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/Worried.png Deleted

psi-plus-main-20160309.tar.xz/iconsets/moods/default/icondef.xml Deleted

@@ -1,415 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<icondef>                                                         
-        <meta>                                                    
-                <name>silk</name>
-                <version>1.2</version>
-                <description>
-Name: silk
-Author: http://www.famfamfam.com/lab/icons/silk/
-Made for Psi: maksim.maj@gmail.com, ky6uk@jabber.ufanet.ru
-Date: 2010-11-16
-                </description>
-				<creation>2008-12-25</creation>
-           </meta>
-
-        <icon>
-                <x xmlns='name'>mood/afraid</x>
-                <object mime='image/png'>Afraid.png</object>
-        </icon>                                                 
-
-        <icon>
-                <x xmlns='name'>mood/amazed</x>
-                <object mime='image/png'>Amazed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/angry</x>
-                <object mime='image/png'>Angry.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/amorous</x>
-			<object mime='image/png'>Amorous.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/annoyed</x>
-                <object mime='image/png'>Annoyed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/anxious</x>
-                <object mime='image/png'>Anxious.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/aroused</x>
-                <object mime='image/png'>Aroused.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/ashamed</x>
-                <object mime='image/png'>Ashamed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/bored</x>
-                <object mime='image/png'>Bored.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/brave</x>
-                <object mime='image/png'>Brave.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/calm</x>
-                <object mime='image/png'>Calm.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/cautious</x>
-			<object mime='image/png'>Cautious.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/cold</x>
-                <object mime='image/png'>Cold.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/confident</x>
-			<object mime='image/png'>Confident.png</object>
-		</icon>
-
-
-        <icon>
-                <x xmlns='name'>mood/confused</x>
-                <object mime='image/png'>Confused.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/contemplative</x>
-			<object mime='image/png'>Contemplative.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/contented</x>
-                <object mime='image/png'>Contented.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/cranky</x>
-                <object mime='image/png'>Cranky.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/crazy</x>
-			<object mime='image/png'>Crazy.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/creative</x>
-			<object mime='image/png'>Creative.png</object>
-        </icon>
-		
-        <icon>
-                <x xmlns='name'>mood/curious</x>
-                <object mime='image/png'>Curious.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/dejected</x>
-			<object mime='image/png'>Dejected.png</object>
-        </icon>
-		
-        <icon>
-                <x xmlns='name'>mood/depressed</x>
-                <object mime='image/png'>Depressed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/disappointed</x>
-                <object mime='image/png'>Disappointed.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/disgusted</x>
-                <object mime='image/png'>Disgusted.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/dismayed</x>
-			<object mime='image/png'>Dismayed.png</object>
-		</icon>
-
-        <icon>
-                <x xmlns='name'>mood/distracted</x>
-                <object mime='image/png'>Distracted.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/embarrassed</x>
-                <object mime='image/png'>Embarrassed.png</object>
-        </icon>
-
-		<icon>
-			<x xmlns='name'>mood/envious</x>
-			<object mime='image/png'>Envious.png</object>
-        </icon>
-		
-        <icon>
-                <x xmlns='name'>mood/excited</x>
-                <object mime='image/png'>Excited.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/flirtatious</x>
-                <object mime='image/png'>Flirtatious.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/frustrated</x>
-                <object mime='image/png'>Frustrated.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/grumpy</x>
-                <object mime='image/png'>Grumpy.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/guilty</x>
-                <object mime='image/png'>Guilty.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/happy</x>
-                <object mime='image/png'>Happy.png</object>
-        </icon>
-		
-		<icon>
-			<x xmlns='name'>mood/hopeful</x>
-			<object mime='image/png'>Hopeful.png</object>
-        </icon>
-
-        <icon>
-                <x xmlns='name'>mood/hot</x>
-                <object mime='image/png'>Hot.png</object>
-        </icon>

psi-plus-main-20160309.tar.xz/patches Deleted

psi-plus-main-20160309.tar.xz/patches/0010-psi-iconsets.diff Deleted

@@ -1,143 +0,0 @@
---- psi.orig/iconsets.qrc
-+++ psi/iconsets.qrc
-@@ -71,7 +71,7 @@
-         <file>iconsets/system/default/pgp.png</file>
-         <file>iconsets/system/default/play.png</file>
-         <file>iconsets/system/default/play_sounds.png</file>
--        <file>iconsets/system/default/psilogo.png</file>
-+        <file>iconsets/system/default/psiplus/psilogo.png</file>
-         <file>iconsets/system/default/psimain.png</file>
-         <file>iconsets/system/default/quit.png</file>
-         <file>iconsets/system/default/register.png</file>
-@@ -125,6 +125,23 @@
-         <file>iconsets/system/default/autojid.png</file>
- 	<file>iconsets/system/default/ignore_global_actions.png</file>
-         <file>iconsets/system/default/action_direct_presence.png</file>
-+        <file>iconsets/system/default/psiplus/psiplus_icon.png</file>
-+        <file>iconsets/system/default/psiplus/action_paste_and_send.png</file>
-+        <file>iconsets/system/default/psiplus/action_vcard_restore.png</file>
-+        <file>iconsets/system/default/psiplus/action_vcard_save_as.png</file>
-+        <file>iconsets/system/default/psiplus/cm_check.png</file>
-+        <file>iconsets/system/default/psiplus/cm_invertcheck.png</file>
-+        <file>iconsets/system/default/psiplus/cm_uncheck.png</file>
-+        <file>iconsets/system/default/psiplus/psiplus_logo.png</file>
-+        <file>iconsets/system/default/psiplus/action_contacts_manager.png</file>
-+        <file>iconsets/system/default/psiplus/doublenextarrow.png</file>
-+        <file>iconsets/system/default/psiplus/doublebackarrow.png</file>
-+        <file>iconsets/system/default/psiplus/crop.png</file>
-+        <file>iconsets/system/default/psiplus/draw.png</file>
-+        <file>iconsets/system/default/psiplus/frame.png</file>
-+        <file>iconsets/system/default/psiplus/palette.png</file>
-+        <file>iconsets/system/default/psiplus/undo.png</file>
-+        <file>iconsets/system/default/psiplus/print.png</file>
-         <file>iconsets/system/default/whiteboarding/whiteboard.png</file>
-         <file>iconsets/system/default/whiteboarding/save.png</file>
-         <file>iconsets/system/default/whiteboarding/select.png</file>
---- psi.orig/iconsets/system/default/icondef.xml
-+++ psi/iconsets/system/default/icondef.xml
-@@ -342,7 +342,7 @@
- 
- 	<icon>
- 		<x xmlns='name'>psi/psiLogo</x>
--		<object mime='image/png'>psilogo.png</object>
-+		<object mime='image/png'>psiplus/psilogo.png</object>
- 	</icon>
- 
- 	<icon>
-@@ -678,4 +678,96 @@
- 		<object mime='image/png'>whiteboarding/ungroup.png</object>
- 	</icon>
- 	
-+
-+    
-+    <icon>
-+		<x xmlns='name'>loggerplugin/openlog</x>
-+		<object mime='image/png'>history.png</object>
-+	</icon>
-+    
-+
-+	
-+	<icon>
-+		<x xmlns='name'>psi/action_paste_and_send</x>
-+		<object mime='image/png'>psiplus/action_paste_and_send.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/action_contacts_manager</x>
-+		<object mime='image/png'>psiplus/action_contacts_manager.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/action_vcard_restore</x>
-+		<object mime='image/png'>psiplus/action_vcard_restore.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/action_vcard_save_as</x>
-+		<object mime='image/png'>psiplus/action_vcard_save_as.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/cm_check</x>
-+		<object mime='image/png'>psiplus/cm_check.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/cm_invertcheck</x>
-+		<object mime='image/png'>psiplus/cm_invertcheck.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/cm_uncheck</x>
-+		<object mime='image/png'>psiplus/cm_uncheck.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/psiplus_logo</x>
-+		<object mime='image/png'>psiplus/psiplus_logo.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/doubleNextArrow</x>
-+		<object mime='image/png'>psiplus/doublenextarrow.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/doubleBackArrow</x>
-+		<object mime='image/png'>psiplus/doublebackarrow.png</object>
-+	</icon>
-+	
-+
-+	
-+	<icon>
-+		<x xmlns='name'>psi/crop</x>
-+		<object mime='image/png'>psiplus/crop.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/draw</x>
-+		<object mime='image/png'>psiplus/draw.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/frame</x>
-+		<object mime='image/png'>psiplus/frame.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/palette</x>
-+		<object mime='image/png'>psiplus/palette.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/undo</x>
-+		<object mime='image/png'>psiplus/undo.png</object>
-+	</icon>
-+
-+	<icon>
-+		<x xmlns='name'>psi/print</x>
-+		<object mime='image/png'>psiplus/print.png</object>
-+	</icon>
-+	
-+
- </icondef>

psi-plus-main-20160309.tar.xz/patches/0020-psi-icon-actions-shortcuts.diff Deleted

@@ -1,149 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -442,6 +442,81 @@
- 			</tabs>
- 		</ui>
- 		<shortcuts comment="Shortcuts">
-+			<alist comment="Action List" >
-+				<menu_disco type="QKeySequence" comment="Service Discovery"></menu_disco>
-+				<menu_add_contact type="QKeySequence" comment="Add Contact"></menu_add_contact>
-+				<menu_new_message type="QKeySequence" comment="New Message"></menu_new_message>
-+				<menu_join_groupchat type="QKeySequence" comment="Join Group Chat"></menu_join_groupchat>
-+				<menu_account_setup type="QKeySequence" comment="Account Setup"></menu_account_setup>
-+				<menu_options type="QKeySequence" comment="Options"></menu_options>
-+				<menu_file_transfer type="QKeySequence" comment="File Transfer"></menu_file_transfer>
-+				<menu_toolbars type="QKeySequence" comment="Toolbars"></menu_toolbars>
-+				<menu_xml_console type="QKeySequence" comment="XML Console"></menu_xml_console>
-+				<menu_change_profile type="QKeySequence" comment="Change Profile"></menu_change_profile>
-+				<menu_play_sounds type="QKeySequence" comment="Play Sounds"></menu_play_sounds>
-+				<menu_quit type="QKeySequence" comment="Quit"></menu_quit>
-+				<button_options type="QKeySequence" comment="Options"></button_options>
-+				<button_status type="QKeySequence" comment="Status"></button_status>
-+				<enable_groups type="QKeySequence" comment="Enable Groups"></enable_groups>
-+				<event_notifier type="QKeySequence" comment="Event Notifier"></event_notifier>
-+				<view_groups type="QKeySequence" comment="View Groups"></view_groups>
-+				<show_offline type="QKeySequence" comment="Show Offline Contacts"></show_offline>
-+				<show_away type="QKeySequence" comment="Show Away Contacts"></show_away>
-+				<show_hidden type="QKeySequence" comment="Show Hidden Contacts"></show_hidden>
-+				<show_agents type="QKeySequence" comment="Show Agents"></show_agents>
-+				<show_self type="QKeySequence" comment="Show Self"></show_self>
-+				<show_statusmsg type="QKeySequence" comment="Show Status Message"></show_statusmsg>
-+				<publish_tune type="QKeySequence" comment="Publish Tune"></publish_tune>
-+				<active_contacts type="QKeySequence" comment="Active contacts"/>
-+				<status_all type="QKeySequence" comment="Status All"></status_all>
-+				<status_group type="QKeySequence" comment="Status Group"></status_group>
-+				<status_chat type="QKeySequence" comment="Status Chat"></status_chat>
-+				<status_online type="QKeySequence" comment="Status Online"></status_online>
-+				<status_away type="QKeySequence" comment="Status Away"></status_away>
-+				<status_xa type="QKeySequence" comment="Status XA"></status_xa>
-+				<status_dnd type="QKeySequence" comment="Status DND"></status_dnd>
-+				<status_invisible type="QKeySequence" comment="Status Invisible"></status_invisible>
-+				<status_offline type="QKeySequence" comment="Status Offline"></status_offline>
-+				<choose_status type="QKeySequence" comment="Choose status"></choose_status>
-+				<reconnect_all type="QKeySequence" comment="Reconnect all accounts"></reconnect_all>
-+				<set_mood type="QKeySequence" comment="Set Mood"/>
-+				<set_activity type="QKeySequence" comment="Set Activity"/>
-+				<set_geoloc type="QKeySequence" comment="Set Geolocation"/>
-+				<help_readme type="QKeySequence" comment="README"></help_readme>
-+				<help_tip type="QKeySequence" comment="Tips"></help_tip>
-+				<help_online_forum type="QKeySequence" comment="Psi Forum (Online)"></help_online_forum>
-+				<help_online_help type="QKeySequence" comment="Open Help"></help_online_help>
-+				<help_online_wiki type="QKeySequence" comment="Open Wiki"></help_online_wiki>
-+				<help_online_home type="QKeySequence" comment="Open Home Page"></help_online_home>
-+				<help_psi_muc type="QKeySequence" comment="Help Psi MUC"></help_psi_muc>
-+				<help_report_bug type="QKeySequence" comment="Report Bug"></help_report_bug>
-+				<help_about type="QKeySequence" comment="About Psi"></help_about>
-+				<help_about_psimedia type="QKeySequence" comment="About PsiMedia" />
-+				<help_about_qt type="QKeySequence" comment="About Qt"></help_about_qt>
-+				<help_diag_qcaplugin type="QKeySequence" comment="QCA plugin diag"></help_diag_qcaplugin>
-+				<help_diag_qcakeystore type="QKeySequence" comment="QCA key store diag"></help_diag_qcakeystore>
-+				<chat_active_contacts type="QKeySequence"></chat_active_contacts>
-+				<chat_add_contact type="QKeySequence"></chat_add_contact>
-+				<chat_clear type="QKeySequence"></chat_clear>
-+				<chat_compact type="QKeySequence"></chat_compact>
-+				<chat_file type="QKeySequence"></chat_file>
-+				<chat_find type="QKeySequence"></chat_find>
-+				<chat_history type="QKeySequence"></chat_history>
-+				<chat_html_text type="QKeySequence"></chat_html_text>
-+				<chat_icon type="QKeySequence"></chat_icon>
-+				<chat_info type="QKeySequence"></chat_info>
-+				<chat_pgp type="QKeySequence"></chat_pgp>
-+				<chat_ps type="QKeySequence"></chat_ps>
-+				<chat_templates type="QKeySequence"></chat_templates>
-+				<chat_voice type="QKeySequence"></chat_voice>
-+				<gchat_clear type="QKeySequence"></gchat_clear>
-+				<gchat_configure type="QKeySequence"></gchat_configure>
-+				<gchat_find type="QKeySequence"></gchat_find>
-+				<gchat_html_text type="QKeySequence"></gchat_html_text>
-+				<gchat_icon type="QKeySequence"></gchat_icon>
-+				<gchat_ps type="QKeySequence"></gchat_ps>
-+				<gchat_templates type="QKeySequence"></gchat_templates>
-+			</alist>
- 			<chat comment="Shortcuts in the chat dialog">
- 				<next-tab type="QVariantList" comment="Switch to the next tab">
- 					<item type="QKeySequence">Ctrl+PgDown</item>
---- psi.orig/src/psiactionlist.cpp
-+++ psi/src/psiactionlist.cpp
-@@ -19,15 +19,20 @@
-  */
- 
- #include "psiactionlist.h"
-+#include "shortcutmanager.h"
- 
- #include <QObject>
- #include <QPointer>
-+#include <map>
-+#include <utility>
- 
- #include "iconset.h"
- #include "psioptions.h"
- 
- #include "mainwin_p.h"
- 
-+using namespace std;
-+
- //----------------------------------------------------------------------------
- // PsiActionList::Private
- //----------------------------------------------------------------------------
-@@ -43,6 +48,7 @@ private:
- 	PsiActionList *list;
- 	PsiCon *psi;
- 	QPointer<ActionList> statusActionList;
-+	map<QString,IconAction*> actionmap;
- 
- 	void createCommon();
- 	void createMainWin();
-@@ -92,13 +98,21 @@ PsiActionList::Private::~Private()
- 
- ActionList* PsiActionList::Private::createActionList( QString name, int id, ActionNames *actionlist )
- {
-+	static const QStringList skipList = QStringList() << "separator" << "spacer";
-+
- 	ActionList *actions = new ActionList( name, id, false );
- 
- 	QString aName;
- 	for ( int i = 0; !(aName = QString(actionlist[i].name)).isEmpty(); i++ ) {
- 		IconAction *action = actionlist[i].action;
- 		if (action)
-+		{
- 			actions->addAction( aName, action );
-+			if(!skipList.contains(aName)) {
-+				action->setShortcuts(ShortcutManager::instance()->shortcuts("alist." + aName));
-+				actionmap[aName] = action;
-+			}
-+		}
- 	}
- 
- 	list->addList( actions );
-@@ -503,6 +517,11 @@ void PsiActionList::Private::optionsChan
- 	statusActionList->action("status_chat")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.chat").toBool());
- 	statusActionList->action("status_xa")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.xa").toBool());
- 	statusActionList->action("status_invisible")->setVisible(PsiOptions::instance()->getOption("options.ui.menu.status.invisible").toBool());
-+
-+	for(map<QString,IconAction*>::iterator i=actionmap.begin(); i!=actionmap.end(); i++)
-+	{
-+		 i->second->setShortcuts(ShortcutManager::instance()->shortcuts("alist." + i->first));
-+	}
- }
- 
- //----------------------------------------------------------------------------

psi-plus-main-20160309.tar.xz/patches/0030-psi-default-application-settings.diff Deleted

@@ -1,224 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -33,7 +33,7 @@
- 		<extended-presence comment="Extended presence options">
- 			<notify comment="Get notified of extended presence changes" type="bool">true</notify>
- 			<tune comment="Tune options">
--				<publish comment="Publish user tune information" type="bool">false</publish>
-+				<publish comment="Publish user tune information" type="bool">true</publish>
- 				<url-filter comment="Ingore tune by media file extension" type="QString">avi asf asx mpg mpg2 mpeg mpe mst mp4 flv 3gp mkv wmv swf rv rm rst dat vob ifo ogv</url-filter>
- 				<title-filter comment="Ignore tune by name via RegExp" type="QString"></title-filter>
- 				<controller-filter comment="List of disabled controllers" type="QString">WinAmp</controller-filter>
-@@ -47,7 +47,7 @@
- 			</bookmarks>
- 			<show-joins comment="Display notices of users joining and leaving conferences" type="bool">true</show-joins>
- 			<show-role-affiliation comment="Include role and affiliation changes in join messages, and display notices of changes" type="bool">true</show-role-affiliation>
--			<show-status-changes comment="Show status changes in groupchat window" type="bool">false</show-status-changes>
-+			<show-status-changes comment="Show status changes in groupchat window" type="bool">true</show-status-changes>
- 			<accept-defaults comment="Automatically accept the default room configuration when a new room is created." type="bool">true</accept-defaults>
- 			<auto-configure comment="Automatically open the configuration dialog when a new room is created. This option only has effect if accept-defaults is false." type="bool">true</auto-configure>
- 			<context comment="Options regarding the context being sent when joining a room">
-@@ -92,14 +92,14 @@
- 				<auto-grab-urls-from-clipboard type="bool">false</auto-grab-urls-from-clipboard>
- 				<auto-popup type="bool">false</auto-popup>
- 				<auto-popup-headlines type="bool">false</auto-popup-headlines>
--				<show-character-count type="bool">false</show-character-count>
-+				<show-character-count type="bool">true</show-character-count>
- 				<show-subjects type="bool">true</show-subjects>
- 				<use-jid-auto-completion type="bool">true</use-jid-auto-completion>
- 				<size type="QString"></size> 
- 			</message>
- 			<chat comment="Chat dialog options">
- 				<theme comment="The theme used for chat messages rendering" type="QString">psi/classic</theme>
--				<central-toolbar comment="Have a central toolbar" type="bool">false</central-toolbar>
-+				<central-toolbar comment="Have a central toolbar" type="bool">true</central-toolbar>
- 				<size comment="Remembered window size" type="QSize">
- 				</size>
- 				<opacity comment="Opacity percentage of chat dialogs" type="int">100</opacity>
-@@ -110,11 +110,11 @@
- 				</avatars>
- 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
- 				<auto-popup type="bool">false</auto-popup>
--				<delete-contents-after type="QString">hour</delete-contents-after>
-+				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<switch-tab-on-new-messages type="bool">false</switch-tab-on-new-messages>
- 				<use-chat-says-style type="bool">false</use-chat-says-style>
--				<use-expanding-line-edit type="bool">true</use-expanding-line-edit>
-+				<use-expanding-line-edit type="bool">false</use-expanding-line-edit>
- 				<use-small-chats type="bool">false</use-small-chats>
- 				<use-message-icons type="bool">true</use-message-icons>
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
-@@ -195,7 +195,7 @@
- 				<use-single-click type="bool">false</use-single-click>
- 				<use-status-change-animation type="bool">true</use-status-change-animation>
- 				<aio-left-roster type="bool">false</aio-left-roster>
--				<use-transport-icons type="bool">false</use-transport-icons>
-+				<use-transport-icons type="bool">true</use-transport-icons>
- 				<saved-window-geometry type="QRect" >
- 					<x>64</x>
- 					<y>64</y>
-@@ -236,7 +236,7 @@
- 					<invisible comment="Enable invisibility" type="bool">false</invisible>
- 				</status>
- 				<view comment="Options for the view menu">
--					<show-away comment="Show the 'show away/xa' toggle" type="bool">false</show-away>
-+					<show-away comment="Show the 'show away/xa' toggle" type="bool">true</show-away>
- 				</view>
- 			</menu>
- 			<muc comment="Multi-User Chat options">
-@@ -399,8 +399,8 @@
- 					</status>
- 				</passive-popups>
- 				<popup-dialogs>
--					<suppress-when-not-on-roster type="bool">false</suppress-when-not-on-roster>
--					<suppress-while-away type="bool">false</suppress-while-away>
-+					<suppress-when-not-on-roster type="bool">true</suppress-when-not-on-roster>
-+					<suppress-while-away type="bool">true</suppress-while-away>
- 				</popup-dialogs>
- 				<sounds>
- 					<chat-message type="QString">sound/chat2.wav</chat-message>
-@@ -419,10 +419,10 @@
- 					<system-message type="QString">sound/chat2.wav</system-message>
- 					<unix-sound-player type="QString"/>
- 				</sounds>
--				<successful-subscription type="bool">false</successful-subscription>
-+				<successful-subscription type="bool">true</successful-subscription>
- 			</notifications>
- 			<service-discovery>
--				<automatically-get-info type="bool">true</automatically-get-info>
-+				<automatically-get-info type="bool">false</automatically-get-info>
- 				<automatically-get-items type="bool">false</automatically-get-items>
- 				<recent-jids type="QStringList" />
- 			</service-discovery>
-@@ -431,7 +431,7 @@
- 				<can-close-inactive-tab type="bool">true</can-close-inactive-tab>
- 				<show-tab-close-buttons type="bool">true</show-tab-close-buttons>
- 				<put-tabs-at-bottom type="bool">false</put-tabs-at-bottom>
--				<use-tabs type="bool">false</use-tabs>
-+				<use-tabs type="bool">true</use-tabs>
- 				<mouse-middle-button type="QString">close</mouse-middle-button> 
- 				<mouse-doubleclick-action type="QString">detach</mouse-doubleclick-action>
- 				<size type="QString"></size> 
-@@ -534,7 +534,7 @@
- 					<item type="QKeySequence">Enter</item>
- 				</send>
- 				<clear type="QKeySequence" comment="Clear the text"/>
--				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+7</quick-command>
-+				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+Space</quick-command>
- 				<show-messageLast type="QKeySequence" comment="Show last message" >Alt+Home</show-messageLast>
- 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
- 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
-@@ -543,7 +543,7 @@
- 			<contactlist comment="Shortcuts in the contactlist">
- 				<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
- 				<clear-custom-avatar type="QKeySequence" comment="Remove custom avatar from the selected contact"/>
--				<delete type="QKeySequence" comment="Delete the selected contact">Del</delete>
-+				<delete type="QKeySequence" comment="Delete the selected contact">Shift+Del</delete>
- 				<chat type="QKeySequence" comment="Open a chat to the selected contact">Ctrl+C</chat>
- 				<message type="QKeySequence" comment="Send a message to the selected contact">Ctrl+M</message>
- 				<event type="QKeySequence" comment="Receive incoming event">Ctrl+R</event>
-@@ -591,7 +591,7 @@
- 		</shortcuts>
- 		<contactlist>
- 			<hide-on-start type="bool">false</hide-on-start>
--			<resolve-nicks-on-contact-add type="bool">false</resolve-nicks-on-contact-add>
-+			<resolve-nicks-on-contact-add type="bool">true</resolve-nicks-on-contact-add>
- 			<use-toolwindow type="bool">false</use-toolwindow>
- 			<autohide-interval type="int">0</autohide-interval>
- 		</contactlist>
-@@ -608,6 +608,10 @@
- 			</emoticons>
- 			<status type="QString">default</status>
- 			<system type="QString">default</system>
-+			<moods type="QString">default</moods>
-+			<clients type="QString">default</clients>
-+			<activities type="QString">default</activities>
-+			<affiliations type="QString">default</affiliations>
- 		</iconsets>
- 		<messages>
- 			<default-outgoing-message-type type="QString">chat</default-outgoing-message-type>
---- psi.orig/options/macosx.xml
-+++ psi/options/macosx.xml
-@@ -16,14 +16,25 @@
- 		</ui>
- 		<shortcuts comment="Shortcuts">
- 			<contactlist comment="Shortcuts in the contactlist">
--				<delete type="QVariantList" comment="Delete the selected contact">
--					<item type="QKeySequence">Backspace</item>
--					<item type="QKeySequence">Del</item>
--				</delete>
-+				<delete type="QKeySequence" comment="Delete the selected contact">Shift+Del</delete>
- 			</contactlist>
- 			<common comment="Common actions" >
- 				<history type="QKeySequence" comment="Open the message history">Ctrl+Shift+H</history>
- 			</common>
-+			<chat comment="Shortcuts in the chat dialog">
-+				<quick-command type="QKeySequence" comment="Change to quick command mode">Ctrl+7</quick-command>
-+			</chat>
- 		</shortcuts>
-+		<ui comment="User interface options">
-+			<disable-send-button type="bool">true</disable-send-button>
-+			<look>
-+				<font>
-+					<chat type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</chat>
-+					<contactlist type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</contactlist>
-+					<message type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</message>
-+					<passive-popup type="QString">Lucida Grande,9,-1,5,50,0,0,0,0,0</passive-popup>
-+				</font>
-+			</look>
-+		</ui>
- 	</options>
- </psi>
---- psi.orig/options/windows.xml
-+++ psi/options/windows.xml
-@@ -6,6 +6,9 @@
- 				<enable type="bool">true</enable>
- 				<use-double-click type="bool">true</use-double-click>
- 			</systemtray>
-+			<spell-check comment="Options related to the spell checker">
-+				<enabled comment="Whether the spell checker is enabled" type="bool">false</enabled>
-+			</spell-check>
- 		</ui>
- 	</options>
- </psi>
---- psi.orig/src/psi_profiles.cpp
-+++ psi/src/psi_profiles.cpp
-@@ -131,17 +131,17 @@ void UserAccount::reset()
- 	port = 5222;
- 	opt_host = false;
- 	host = "";
--	opt_automatic_resource = true;
-+	opt_automatic_resource = false;
- 	priority_dep_on_status = true;
- 	ignore_global_actions = false;
- 	resource = ApplicationInfo::name();
--	priority = 5;
-+	priority = 55;
- 	ibbOnly = false;
- 	opt_keepAlive = true;

psi-plus-main-20160309.tar.xz/patches/0040-psi-tabs-button-killer.diff Deleted

@@ -1,80 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -439,6 +439,7 @@
- 				<group-state comment="Saved state data of the tabsets defined by options.ui.tabs.grouping"/>
- 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
- 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
-+				<show-tab-buttons type="bool">true</show-tab-buttons>
- 			</tabs>
- 		</ui>
- 		<shortcuts comment="Shortcuts">
---- psi.orig/src/options/opt_chat.cpp
-+++ psi/src/options/opt_chat.cpp
-@@ -107,6 +107,7 @@ void OptionsTabChat::applyOptions()
- 	PsiOptions::instance()->setOption("options.ui.chat.raise-chat-windows-on-new-messages", d->ck_raiseChatWindow->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.chat.switch-tab-on-new-messages", d->ck_switchTabOnMessage->isChecked());
- 	PsiOptions::instance()->setOption("options.ui.chat.use-small-chats", d->ck_smallChats->isChecked());
-+	PsiOptions::instance()->setOption("options.ui.tabs.show-tab-buttons", d->ck_showTabButtons->isChecked());
- 
- 	QString delafter;
- 	switch (bg_delChats->buttons().indexOf( bg_delChats->checkedButton() )) {
-@@ -184,6 +185,7 @@ void OptionsTabChat::restoreOptions()
- 	d->ck_raiseChatWindow->setChecked( PsiOptions::instance()->getOption("options.ui.chat.raise-chat-windows-on-new-messages").toBool() );
- 	d->ck_switchTabOnMessage->setChecked( PsiOptions::instance()->getOption("options.ui.chat.switch-tab-on-new-messages").toBool() );
- 	d->ck_smallChats->setChecked( PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool() );
-+	d->ck_showTabButtons->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool() );
- 	d->ck_tabChats->setChecked( PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool() );
- 	d->cb_tabGrouping->setEnabled(PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool());
- 	QString tabGrouping = PsiOptions::instance()->getOption("options.ui.tabs.grouping").toString();
---- psi.orig/src/options/opt_chat.ui
-+++ psi/src/options/opt_chat.ui
-@@ -127,6 +127,13 @@
-     </layout>
-    </item>
-    <item>
-+    <widget class="QCheckBox" name="ck_showTabButtons" >
-+     <property name="text" >
-+      <string>Show tab buttons</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QCheckBox" name="ck_autoResize" >
-      <property name="text" >
-       <string>Auto-resize text input field</string>
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -1414,7 +1414,8 @@ void PsiCon::optionChanged(const QString
- 	}
- 
- 	if (option == "options.ui.tabs.use-tabs" ||
--		option == "options.ui.tabs.grouping") {
-+		option == "options.ui.tabs.grouping" ||
-+		option == "options.ui.tabs.show-tab-buttons") {
- 		QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart."));
- 		//notifyRestart = false;
- 	}
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -825,7 +825,7 @@ void TabDlg::setUserManagementEnabled(bo
- 	}
- 
- 	userManagement_ = enabled;
--	tabWidget_->setTabButtonsShown(enabled);
-+	tabWidget_->setTabButtonsShown(PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool());
- 	tabWidget_->setDragsEnabled(enabled);
- }
- 
---- psi.orig/src/widgets/psitabwidget.cpp
-+++ psi/src/widgets/psitabwidget.cpp
-@@ -78,6 +78,10 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
- 	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-close-buttons").toBool()){
- 		tabBar_->setTabsClosable(false);
- 	}
-+	if (!PsiOptions::instance()->getOption("options.ui.tabs.show-tab-buttons").toBool()){
-+		closeButton_->hide();
-+		downButton_->hide();
-+	}
- 	connect(tabBar_, SIGNAL(mouseDoubleClickTab(int)), SLOT(mouseDoubleClickTab(int)));
- 	connect(tabBar_, SIGNAL(mouseMiddleClickTab(int)), SLOT(mouseMiddleClickTab(int)));
- 	connect(tabBar_, SIGNAL( currentChanged(int)), SLOT(tab_currentChanged(int)));

psi-plus-main-20160309.tar.xz/patches/0050-psi-plugins-qcm-fix.diff Deleted

@@ -1,43 +0,0 @@
---- psi.orig/qcm/plugins.qcm
-+++ psi/qcm/plugins.qcm
-@@ -1,8 +1,6 @@
- /*
- -----BEGIN QCMOD-----
--name: Plugins
--arg: enable-plugins,Enable Psi Plugin support
--
-+name: Psi Plugin support
- -----END QCMOD-----
- */
- 
-@@ -13,17 +11,10 @@ class qc_plugins : public ConfObj
- {
- public:
- 	qc_plugins(Conf *c) : ConfObj(c) {}
--	QString name() const { return "Plugins"; }
--	QString shortname() const { return "Plugins"; }
-+	QString name() const { return "Psi Plugin support"; }
-+	QString shortname() const { return "plugins"; }
- 	bool exec()
- 	{
--		QString s;
--
--		// Check if Jingle was enabled explicitly
--		s = conf->getenv("QC_ENABLE_PLUGINS");
--		if(s.isEmpty())
--			return false;
--
- 		conf->addDefine("PSI_PLUGINS");
- 
- 		// Finish
---- psi.orig/psi.qc
-+++ psi/psi.qc
-@@ -45,7 +45,7 @@
-   <dep type='spell'>
-     <required/>
-   </dep>
--  
-+  <dep type='plugins'><disabled/></dep>
-   <dep type='conf'>
-     <required/>
-   </dep>

psi-plus-main-20160309.tar.xz/patches/0060-psi-configure-hyperlink-color.diff Deleted

@@ -1,35 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -345,6 +345,10 @@
- 						<usertext type="QColor" comment="Color used to indicate additional text for informational messages.">#606060</usertext>
- 						<highlighting type="QColor">#FF0000</highlighting>
- 					</messages>
-+					<chat>
-+						<link-color type="QColor">#0000ff</link-color>
-+						<mailto-color type="QColor">#0000ff</mailto-color>
-+					</chat>
- 					<passive-popup>
- 						<border type="QColor">#5297f9</border>
- 					</passive-popup>
---- psi.orig/src/textutil.cpp
-+++ psi/src/textutil.cpp
-@@ -411,7 +411,8 @@ QString TextUtil::linkify(const QString
- 			href = escape(href);
- 			href = linkify_htmlsafe(href);
- 			//printf("link: [%s], href=[%s]\n", link.latin1(), href.latin1());
--			linked = QString("<a href=\"%1\">").arg(href) + escape(link) + "</a>" + escape(pre.mid(cutoff));
-+			QColor lcolor=PsiOptions::instance()->getOption("options.ui.look.colors.chat.link-color").toString();
-+			linked = QString("<a href=\"%1\" style=\"color:"+lcolor.name()+"\">").arg(href) + escape(link) + "</a>" + escape(pre.mid(cutoff));
- 			out.replace(x1, len, linked);
- 			n = x1 + linked.length() - 1;
- 		}
-@@ -444,7 +445,8 @@ QString TextUtil::linkify(const QString
- 
- 			href += link;
- 			//printf("link: [%s], href=[%s]\n", link.latin1(), href.latin1());
--			linked = QString("<a href=\"%1\">").arg(href) + link + "</a>";
-+			QColor mcolor=PsiOptions::instance()->getOption("options.ui.look.colors.chat.mailto-color").toString();
-+			linked = QString("<a href=\"%1\" style=\"color:"+mcolor.name()+"\">").arg(href) + link + "</a>";
- 			out.replace(x1, len, linked);
- 			n = x1 + linked.length() - 1;
- 		}

psi-plus-main-20160309.tar.xz/patches/0070-psi-dirty-check.diff Deleted

@@ -1,295 +0,0 @@
---- psi.orig/src/AutoUpdater/AutoUpdater.pri
-+++ psi/src/AutoUpdater/AutoUpdater.pri
-@@ -16,3 +16,16 @@ Sparkle {
- 
- 	LIBS += -framework Sparkle
- }
-+
-+QuickDirtyChecker {
-+        DEFINES += USE_QDCHECKER
-+
-+        HEADERS += \
-+                $$PWD/QDChecker.h
-+
-+        SOURCES += \
-+                $$PWD/QDChecker.cpp
-+
-+        FORMS += \
-+                $$PWD/QDChangeLog.ui
-+}
---- /dev/null
-+++ psi/src/AutoUpdater/QDChangeLog.ui
-@@ -0,0 +1,71 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<ui version="4.0">
-+ <class>ShowChangeLogForm</class>
-+ <widget class="QWidget" name="ShowChangeLogForm">
-+  <property name="geometry">
-+   <rect>
-+    <x>0</x>
-+    <y>0</y>
-+    <width>400</width>
-+    <height>300</height>
-+   </rect>
-+  </property>
-+  <property name="windowTitle">
-+   <string>New version is available!</string>
-+  </property>
-+  <layout class="QGridLayout" name="gridLayout">
-+   <property name="margin">
-+    <number>6</number>
-+   </property>
-+   <property name="spacing">
-+    <number>2</number>
-+   </property>
-+   <item row="0" column="0">
-+    <widget class="QTextEdit" name="logText">
-+     <property name="readOnly">
-+      <bool>true</bool>
-+     </property>
-+     <property name="textInteractionFlags">
-+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-+     </property>
-+    </widget>
-+   </item>
-+   <item row="1" column="0">
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+     <item>
-+      <widget class="QLabel" name="label">
-+       <property name="text">
-+        <string>Open download page?</string>
-+       </property>
-+       <property name="alignment">
-+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QDialogButtonBox" name="buttonBox">
-+       <property name="standardButtons">
-+        <set>QDialogButtonBox::No|QDialogButtonBox::Yes</set>
-+       </property>
-+      </widget>
-+     </item>
-+    </layout>
-+   </item>
-+  </layout>
-+ </widget>
-+ <resources/>
-+ <connections/>
-+</ui>
---- /dev/null
-+++ psi/src/AutoUpdater/QDChecker.cpp
-@@ -0,0 +1,100 @@
-+/*
-+ * Quick-and-dirty checker for updates.
-+ * Written by Aleksey Palazhchenko.
-+ * No rights reserved for this ugly code. This file is in public domain.
-+ */
-+
-+#include "QDChecker.h"
-+#include "ui_QDChangeLog.h"
-+
-+#include <QUrl>
-+#include <QDesktopServices>
-+#include <QNetworkAccessManager>
-+#include <QNetworkRequest>
-+#include <QNetworkReply>
-+#include <QNetworkProxy>
-+
-+#include "psioptions.h"
-+#include "proxy.h"
-+
-+const QUrl QDChecker::updateCheckUrl_ = QUrl("https://raw.githubusercontent.com/psi-plus/main/master/version.txt");
-+const QUrl QDChecker::changelogUrl_ = QUrl("https://raw.githubusercontent.com/psi-plus/main/master/changelog.txt");
-+const QUrl QDChecker::downloadPageUrl_ = QUrl("http://sourceforge.net/projects/psiplus/files/MS-Windows/Installers/0.16/");
-+
-+const QString QDChecker::settingsKey_ = QLatin1String("options.auto-update.last-check-value");
-+
-+QDChecker::QDChecker()
-+	: manager_(new QNetworkAccessManager(this)), logForm_(0)
-+{
-+	ProxyItem it = ProxyManager::instance()->getItemForObject("Auto Updater");
-+	ProxySettings ps = it.settings;
-+	if(!ps.host.isEmpty()) {
-+		QNetworkProxy prx(QNetworkProxy::HttpCachingProxy, ps.host, ps.port, ps.user, ps.pass);
-+		if(it.type == "socks")
-+			prx.setType(QNetworkProxy::Socks5Proxy);
-+		manager_->setProxy(prx);
-+	}
-+}
-+
-+QDChecker::~QDChecker()
-+{
-+	delete logForm_;
-+}
-+
-+void QDChecker::checkForUpdates()
-+{
-+	QNetworkRequest request(updateCheckUrl_);
-+	QNetworkReply* reply = manager_->get(request);
-+	connect(reply, SIGNAL(finished()), this, SLOT(onCheckFinished()));
-+}
-+
-+void QDChecker::onCheckFinished()
-+{
-+	qDebug("onCheckFinished");
-+	QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-+	if(reply && reply->error() == QNetworkReply::NoError) {
-+		const QByteArray data = reply->readAll();
-+		const quint16 newValue = qChecksum(data.constData(), data.size());
-+		const quint16 oldValue = PsiOptions::instance()->getOption(settingsKey_).toUInt();
-+
-+		if(newValue != oldValue) {
-+			QNetworkRequest request(changelogUrl_);
-+			QNetworkReply* reply = manager_->get(request);
-+			connect(reply, SIGNAL(finished()), this, SLOT(onDownloadLogFinished()));
-+			PsiOptions::instance()->setOption(settingsKey_, newValue);
-+		}
-+
-+		reply->deleteLater();
-+	} else {
-+		qCritical("WTF?! at %s %d", __FILE__, __LINE__);
-+	}
-+}
-+
-+void QDChecker::onDownloadLogFinished()
-+{
-+	qDebug("onDownloadLogFinished");
-+	QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-+	if(reply && reply->error() == QNetworkReply::NoError) {
-+		if(logForm_) {
-+			logForm_->deleteLater();
-+		}
-+		Ui::ShowChangeLogForm ui;
-+		logForm_ = new QWidget;
-+		ui.setupUi(logForm_);
-+
-+		ui.logText->setText(QString::fromUtf8(reply->readAll()));
-+
-+		connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(onOpenDownloadPage()));
-+		connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), logForm_, SLOT(hide()));
-+		logForm_->show();
-+
-+		reply->deleteLater();
-+	} else {
-+		qCritical("WTF?! at %s %d", __FILE__, __LINE__);
-+	}
-+}
-+
-+void QDChecker::onOpenDownloadPage()
-+{
-+	QDesktopServices::openUrl(downloadPageUrl_);
-+}
---- /dev/null
-+++ psi/src/AutoUpdater/QDChecker.h
-@@ -0,0 +1,44 @@

psi-plus-main-20160309.tar.xz/patches/0080-psi-temp-show-caps.diff Deleted

psi-plus-main-20160309.tar.xz/patches/0090-psi-add-view-groups-to-tray-menu.diff Deleted

psi-plus-main-20160309.tar.xz/patches/0100-psi-contact-manager.diff Deleted

@@ -1,1228 +0,0 @@
---- a/src/contactlistaccountmenu.cpp
-+++ b/src/contactlistaccountmenu.cpp
-@@ -32,6 +32,7 @@
- #include "privacy/privacydlg.h"
- #include "psiiconset.h"
- #include "common.h"
-+#include "contactmanager/contactmanagerdlg.h"
- #include "mucjoindlg.h"
- 
- class ContactListAccountMenu::Private : public QObject
-@@ -46,6 +47,7 @@ class ContactListAccountMenu::Private : public QObject
- 	QAction* setAvatarAction_;
- 	QMenu* avatarMenu_;
- 	QAction* unsetAvatarAction_;
-+	QAction* contactManagerAction_;
- 	QMenu* bookmarksMenu_;
- 	QAction* bookmarksManageAction_;
- 	QList<QAction*> bookmarksJoinActions_;
-@@ -101,6 +103,9 @@ public:
- 		unsetAvatarAction_ = new QAction(tr("Unset Avatar"), this);
- 		connect(unsetAvatarAction_, SIGNAL(triggered()), SLOT(unsetAvatar()));
- 
-+		contactManagerAction_ = new IconAction(tr("&Contacts Manager"), this, "psi/action_contacts_manager");
-+		connect(contactManagerAction_, SIGNAL(triggered()), SLOT(contactManager()));
-+
- 		bookmarksManageAction_ = new QAction(tr("Manage Bookmarks"), this);
- 		connect(bookmarksManageAction_, SIGNAL(triggered()), SLOT(bookmarksManage()));
- 
-@@ -155,6 +160,7 @@ public:
- 		menu->addAction(addContactAction_);
- 		menu->addAction(serviceDiscoveryAction_);
- 		menu->addAction(newMessageAction_);
-+		menu->addAction(contactManagerAction_);
- 		menu->addAction(privacyListsAction_);
- 		menu->addSeparator();
- 		menu->addAction(xmlConsoleAction_);
-@@ -219,6 +225,7 @@ private slots:
- 		newMessageAction_->setEnabled(account->account()->isAvailable());
- 		addContactAction_->setEnabled(account->account()->isAvailable());
- 		serviceDiscoveryAction_->setEnabled(account->account()->isAvailable());
-+		contactManagerAction_->setEnabled(account->account()->isAvailable());
- 		privacyListsAction_->setEnabled(account->account()->isAvailable());
- 		if (!PsiOptions::instance()->getOption("options.ui.menu.account.admin").toBool()) {
- 			adminMenu_->menuAction()->setVisible(false);
-@@ -344,6 +351,19 @@ private slots:
- 			bringToFront(dlg);
- 	}
- 
-+	void contactManager()
-+	{
-+		if (!account)
-+			return;
-+
-+		ContactManagerDlg *dlg = account->account()->findDialog<ContactManagerDlg*>();
-+		if(!dlg) {
-+			dlg = new ContactManagerDlg(account->account());
-+			dlg->show();
-+		} else
-+			bringToFront(dlg);
-+	}
-+
- 	void xmlConsole()
- 	{
- 		if (!account)
-new file mode 100644
---- /dev/null
-+++ b/src/contactmanager/contactmanager.pri
-@@ -0,0 +1,7 @@
-+HEADERS += $$PWD/contactmanagerdlg.h \
-+    $$PWD/contactmanagermodel.h \
-+	$$PWD/contactmanagerview.h
-+SOURCES += $$PWD/contactmanagerdlg.cpp \
-+    $$PWD/contactmanagermodel.cpp \
-+	$$PWD/contactmanagerview.cpp
-+FORMS += $$PWD/contactmanagerdlg.ui
-new file mode 100644
---- /dev/null
-+++ b/src/contactmanager/contactmanagerdlg.cpp
-@@ -0,0 +1,318 @@
-+/*
-+ * contactmanagerdlg.cpp
-+ * Copyright (C) 2010 Rion
-+ *
-+ * 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 2
-+ * 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 library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include <QMessageBox>
-+#include <QItemSelectionModel>
-+#include <QFileDialog>
-+#include <QFile>
-+#include <QScrollArea>
-+#include <QCheckBox>
-+
-+#include "contactmanagerdlg.h"
-+
-+#include "psiaccount.h"
-+#include "userlist.h"
-+#include "xmpp_tasks.h"
-+#include "psiiconset.h"
-+#include "vcardfactory.h"
-+//#include "contactview.h"
-+
-+
-+ContactManagerDlg::ContactManagerDlg(PsiAccount *pa) :
-+	QDialog(0, Qt::Window),
-+	pa_(pa),
-+	um(0)
-+{
-+	setAttribute(Qt::WA_DeleteOnClose, true);
-+	ui_.setupUi(this);
-+	pa_->dialogRegister(this);
-+	setWindowTitle(tr("Contacts Manager")+" - "+pa->jid().bare());
-+
-+	um = new ContactManagerModel(this, pa_);
-+	um->reloadUsers();
-+	ui_.usersView->setModel(um);
-+	ui_.usersView->init();
-+
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/sendMessage").icon(), tr("Message"), 1);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/remove").icon(), tr("Remove"), 2);
-+	ui_.cbAction->addItem(IconsetFactory::icon("status/ask").icon(), tr("Auth request"), 3);
-+	ui_.cbAction->addItem(IconsetFactory::icon("status/ask").icon(), tr("Auth grant"), 4);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/command").icon(), tr("Change domain"), 5);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/info").icon(), tr("Resolve nicks"), 6);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/browse").icon(), tr("Move to group"), 7);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/export").icon(), tr("Export"), 8);
-+	ui_.cbAction->addItem(IconsetFactory::icon("psi/import").icon(), tr("Import"), 9);
-+	connect(ui_.cbAction, SIGNAL(currentIndexChanged(int)), this, SLOT(showParamField(int)));
-+	showParamField(0); // 0 - default index of combobox
-+
-+	ui_.cmbField->insertItems(0, um->manageableFields());
-+	ui_.cmbMatchType->addItem(tr("Simple"), ContactManagerModel::SimpleMatch);
-+	ui_.cmbMatchType->addItem(tr("RegExp"), ContactManagerModel::RegexpMatch);
-+	connect(ui_.btnExecute, SIGNAL(clicked()), this, SLOT(executeCurrent()));
-+	connect(ui_.btnSelect, SIGNAL(clicked()), this, SLOT(doSelect()));
-+
-+	connect(pa_->client(), SIGNAL(rosterRequestFinished(bool,int,QString)), this, SLOT(client_rosterUpdated(bool,int,QString)));
-+}
-+
-+
-+
-+ContactManagerDlg::~ContactManagerDlg()
-+{
-+	pa_->dialogUnregister(this);
-+}
-+
-+void ContactManagerDlg::changeEvent(QEvent *e)
-+{
-+    switch (e->type()) {
-+    case QEvent::LanguageChange:
-+		ui_.retranslateUi(this);
-+        break;
-+    default:
-+        break;
-+    }
-+}
-+
-+void ContactManagerDlg::doSelect()
-+{
-+	int type = ui_.cmbMatchType->itemData(ui_.cmbMatchType->currentIndex()).toInt();
-+	int coumnIndex = ui_.cmbField->currentIndex();
-+	um->invertByMatch(coumnIndex + 1, type,  ui_.edtMatch->text());
-+}
-+
-+void ContactManagerDlg::executeCurrent()
-+{
-+	int action = ui_.cbAction->itemData(ui_.cbAction->currentIndex()).toInt();
-+	QList<UserListItem *> users = um->checkedUsers();
-+	if (!users.count() && action != 9) {
-+		return;
-+	}
-+	switch (action) {
-+		case 1: //message
-+			{
-+				QList<XMPP::Jid> list;
-+				foreach (UserListItem *u, users) {
-+					list.append(u->jid().full());
-+				}
-+				pa_->actionSendMessage(list);
-+			}
-+			break;
-+		case 2: //remove
-+			{
-+				if (QMessageBox::question(this, tr("Removal confirmation"),
-+										  tr("Are you sure want to delete selected contacts?"),
-+										  QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) {

psi-plus-main-20160309.tar.xz/patches/0110-psiplus-more-compatibility-with-skinsplugin.diff Deleted

@@ -1,37 +0,0 @@
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -358,6 +358,8 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	} else
- 		setCentralWidget(rosterBar);
- 
-+	connect(PsiOptions::instance(), SIGNAL(optionChanged(const QString&)), SLOT(optionChanged(const QString&)));
-+
- 	d->vb_roster = new QVBoxLayout(rosterBar);
- #ifndef NEWCONTACTLIST
- 	cvlist = new ContactView(rosterBar);
-@@ -600,6 +602,14 @@ void MainWin::splitterMoved()
- 	d->tabsSize = d->isLeftRoster ? list.last() : list.first();
- }
- 
-+void MainWin::optionChanged(const QString& option)
-+{
-+	if (option == toolbarsStateOptionPath) { //for compatibility with skins plugin
-+		loadToolbarsState();
-+		//buildToolbars(); //FIXME!!! not a very good solution
-+	}
-+}
-+
- void MainWin::registerAction( IconAction* action )
- {
- 	const char *activated  = SIGNAL( triggered() );
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -168,6 +168,8 @@ private slots:
- 
- 	void hideTimerTimeout();
- 
-+	void optionChanged(const QString&);
-+
- public slots:
- 	void setWindowIcon(const QPixmap&);
- 	void showNoFocus();

psi-plus-main-20160309.tar.xz/patches/0120-psi-css-style-sheet.diff Deleted

@@ -1,349 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -120,6 +120,7 @@
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
- 				<show-status-changes type="bool">true</show-status-changes>
- 				<warn-before-clear type="bool">true</warn-before-clear>
-+				<css type="QString" />
- 				<hide-when-closing type="bool">false</hide-when-closing>
- 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
- 				<default-jid-mode comment="Default jid mode: barejid | auto" type="QString">barejid</default-jid-mode>
-@@ -144,6 +145,7 @@
- 					<show comment="Show status messages" type="bool">false</show>
- 				</status-messages>
- 				<tooltip comment="Display options for the contact list tooltips">
-+					<css type="QString"></css>
- 					<avatar comment="Display avatar" type="bool">true</avatar>
- 					<client-version comment="Display client version information" type="bool">true</client-version>
- 					<geolocation comment="Display geolocation information" type="bool">true</geolocation>
-@@ -152,6 +154,58 @@
- 				</tooltip>
- 				<temp-no-roster-animation comment="Disable animated icons. This option will be removed as soon as the contactlist code is optimized enough" type="bool">false</temp-no-roster-animation>
- 				<account-sort-style type="QString">alpha</account-sort-style>
-+				<css type="QString">/* frame of avatar - general settings */
-+/* фрейм с аватаром - общие настройки */
-+RosterAvatarFrame * {
-+	margin: 1px;
-+}
-+
-+/* frame of avatar - avatar */
-+/* фрейм с аватаром - аватар */
-+QLabel#lb_avatar {
-+	margin-left: 0px;
-+	margin-top: 2px;
-+	margin-bottom: 2px;
-+	border: 1px solid #949494;
-+	border-radius: 3px;
-+}
-+
-+/* frame of avatar - nick */
-+/* фрейм с аватаром - ник */
-+QLabel#lb_nick {
-+	margin: 2px;
-+	margin-right: 1px;
-+	margin-bottom: 3px;
-+	border: 1px solid #949494;
-+	border-radius: 3px;
-+}
-+
-+/* frame of avatar - buttons of PEP and status */
-+/* фрейм с аватаром - кнопки PEP и статуса */
-+QToolButton#tb_status, #tb_mood, #tb_activity {
-+	margin-left: 1px;
-+	margin-right: 1px;
-+	margin-bottom: 2px;
-+	width: 100%;
-+}
-+
-+QToolButton#tb_status {
-+	margin-top: 0px;
-+	margin-bottom: 1px;
-+}
-+
-+/* frame of avatar - button of status, arrow */
-+/* фрейм с аватаром - кнопка статуса, стрелка */
-+QToolButton#tb_status::menu-indicator {
-+	background: argb(0,0,0,0);
-+}
-+
-+/* frame of avatar - field of status message */
-+/* фрейм с аватаром - строка статусного сообщения */
-+QLineEdit#le_status_text {
-+	margin-right: 0px;
-+	margin-bottom: 2px;
-+}</css>
- 				<always-on-top type="bool">false</always-on-top>
- 				<automatically-resize-roster type="bool">false</automatically-resize-roster>
- 				<grow-roster-upwards type="bool">true</grow-roster-upwards>
-@@ -363,6 +417,7 @@
- 					<message type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</message>
- 					<passive-popup type="QString">Sans Serif,7,-1,5,50,0,0,0,0,0</passive-popup>
- 				</font>
-+				<css type="QString" />
- 			</look>
- 			<notifications>
- 				<send-receipts type="bool" >true</send-receipts>
-@@ -379,6 +434,7 @@
- 						<status type="int">2000</status>
- 					</delays>
- 					<enabled type="bool">false</enabled>
-+					<css type="QString"></css>
- 					<top-to-bottom type="bool">false</top-to-bottom>
- 					<at-left-corner type="bool">false</at-left-corner>
- 					<incoming-chat type="bool">true</incoming-chat>
---- psi.orig/src/contactlistitemmenu.cpp
-+++ psi/src/contactlistitemmenu.cpp
-@@ -21,12 +21,17 @@
- #include "contactlistitemmenu.h"
- 
- #include "shortcutmanager.h"
-+#include "psioptions.h"
- 
- ContactListItemMenu::ContactListItemMenu(ContactListItem* item, ContactListModel* model)
- 	: QMenu(0)
- 	, item_(item)
- 	, model_(model)
- {
-+	const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+	}
- }
- 
- ContactListItemMenu::~ContactListItemMenu()
---- psi.orig/src/gcuserview.cpp
-+++ psi/src/gcuserview.cpp
-@@ -721,6 +721,10 @@ void GCUserView::doContextMenu(QTreeWidg
- 	pm->addAction(act);
- 	act->setData(3);
- 
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		pm->setStyleSheet(css);
-+	}
- 	int x = -1;
- 	bool enabled = false;
- 	act = pm->exec(QCursor::pos());
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -1907,6 +1907,11 @@ QString GCMainDlg::desiredCaption() cons
- 
- void GCMainDlg::setLooks()
- {
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+		d->mle()->setCssString(css);
-+	}
- 	ui_.vsplitter->optionsChanged();
- 	ui_.mle->optionsChanged();
- 
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -574,6 +574,7 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 
- 		/*QShortcut *sp_ss = new QShortcut(QKeySequence(tr("Ctrl+Shift+N")), this);
- 		connect(sp_ss, SIGNAL(triggered()), SLOT(avcallConfig()));*/
-+	optionChanged("options.ui.contactlist.css");
- 
- 	reinitAutoHide();
- }
-@@ -608,6 +609,12 @@ void MainWin::optionChanged(const QStrin
- 		loadToolbarsState();
- 		//buildToolbars(); //FIXME!!! not a very good solution
- 	}
-+	else if (option == "options.ui.contactlist.css") {
-+		const QString css = PsiOptions::instance()->getOption("options.ui.contactlist.css").toString();
-+		if (!css.isEmpty()) {
-+			setStyleSheet(css);
-+		}
-+	}
- }
- 
- void MainWin::registerAction( IconAction* action )
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -284,6 +284,11 @@ void PsiChatDlg::setLooks()
- {
- 	ChatDlg::setLooks();
- 
-+	const QString css = PsiOptions::instance()->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty()) {
-+		setStyleSheet(css);
-+		chatEdit()->setCssString(css);
-+	}
- 	ui_.splitter->optionsChanged();
- 	ui_.mle->optionsChanged();
- 
---- psi.orig/src/psicon.cpp
-+++ psi/src/psicon.cpp
-@@ -511,6 +511,10 @@ bool PsiCon::init()
- 	d->iconSelect = new IconSelectPopup(0);
- 	connect(PsiIconset::instance(), SIGNAL(emoticonsChanged()), d, SLOT(updateIconSelect()));
- 
-+	const QString css = options->getOption("options.ui.chat.css").toString();
-+	if (!css.isEmpty())
-+		d->iconSelect->setStyleSheet(css);
-+
- 	// first thing, try to load the iconset
- 	bool result = true;;
- 	if( !PsiIconset::instance()->loadAll() ) {
-@@ -1428,6 +1432,13 @@ void PsiCon::optionChanged(const QString
- 		s5b_init();
- 	}
- 
-+	if (option == "options.ui.chat.css") {
-+		QString css = PsiOptions::instance()->getOption(option).toString();
-+		if (!css.isEmpty())
-+			d->iconSelect->setStyleSheet(css);
-+		return;

psi-plus-main-20160309.tar.xz/patches/0130-psiplus-nix-application-icon-and-name.diff Deleted

@@ -1,34 +0,0 @@
---- psi.orig/psi.desktop
-+++ psi/psi.desktop
-@@ -2,7 +2,7 @@
- # This is the spec version, *not* the application version
- Version=1.0
- Type=Application
--Name=Psi
-+Name=Psi+
- GenericName=XMPP Client
- Comment=Communicate over the XMPP network
- Icon=psi
---- psi.orig/src/src.pro
-+++ psi/src/src.pro
-@@ -45,15 +45,15 @@ unix {
- 	dt.path=$$PREFIX/share/applications/
- 	dt.files = ../psi.desktop
- 	icon1.path=$$PREFIX/share/icons/hicolor/16x16/apps
--	icon1.extra = cp -f ../iconsets/system/default/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png
-+	icon1.extra = cp -f ../iconsets/system/default/psiplus/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png
- 	icon2.path=$$PREFIX/share/icons/hicolor/32x32/apps
--	icon2.extra = cp -f ../iconsets/system/default/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi.png
-+	icon2.extra = cp -f ../iconsets/system/default/psiplus/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi.png
- 	icon3.path=$$PREFIX/share/icons/hicolor/48x48/apps
--	icon3.extra = cp -f ../iconsets/system/default/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi.png
-+	icon3.extra = cp -f ../iconsets/system/default/psiplus/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi.png
- 	icon4.path=$$PREFIX/share/icons/hicolor/64x64/apps
--	icon4.extra = cp -f ../iconsets/system/default/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi.png
-+	icon4.extra = cp -f ../iconsets/system/default/psiplus/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi.png
- 	icon5.path=$$PREFIX/share/icons/hicolor/128x128/apps
--	icon5.extra = cp -f ../iconsets/system/default/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi.png
-+	icon5.extra = cp -f ../iconsets/system/default/psiplus/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi.png
- 	INSTALLS += dt icon1 icon2 icon3 icon4 icon5
- }
-

psi-plus-main-20160309.tar.xz/patches/0140-psi-tray-act-bring-to-front.diff Deleted

@@ -1,441 +0,0 @@
---- a/options/default.xml
-+++ b/options/default.xml
-@@ -218,6 +218,7 @@ QLineEdit#le_status_text {
- 				<lockdown-roster type="bool">false</lockdown-roster>
- 				<raise-on-new-event type="bool">false</raise-on-new-event>
- 				<quit-on-close type="bool">false</quit-on-close>
-+				<raise-inactive type="bool">true</raise-inactive>
- 				<show-avatar-frame type="bool">false</show-avatar-frame>
- 				<show>
- 					<agent-contacts type="bool">true</agent-contacts>
---- a/src/mainwin.cpp
-+++ b/src/mainwin.cpp
-@@ -84,6 +84,10 @@
- #include "rosteravatarframe.h"
- #include "avatars.h"
- 
-+#ifdef HAVE_X11
-+#include <x11windowsystem.h>
-+#endif
-+
- using namespace XMPP;
- 
- static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
-@@ -161,6 +165,10 @@ public:
- 	PsiRosterWidget* rosterWidget_;
- #endif
- 
-+#ifdef Q_OS_WIN
-+	DWORD deactivationTickCount;
-+#endif
-+
- 	void registerActions();
- 	IconAction* getAction( QString name );
- 	void updateMenu(QStringList actions, QMenu* menu);
-@@ -1478,7 +1486,23 @@ void MainWin::closeEvent(QCloseEvent* e)
- 
- void MainWin::changeEvent(QEvent *event)
- {
--    if (event->type() == QEvent::ActivationChange ||
-+#ifdef Q_OS_WIN
-+	if (event->type() == QEvent::ActivationChange
-+		&& PsiOptions::instance()->getOption("options.ui.systemtray.enable").toBool()
-+		&& PsiOptions::instance()->getOption("options.ui.contactlist.raise-inactive").toBool()) {
-+		//On Windows app window loose active state when you
-+		//  click on tray icon. Workaround is to use timer:
-+		//  we'll keep activated == true within 300 msec
-+		//  (+ doubleClickInterval, if double click is enabled)
-+		//  after deactivation.
-+		if (!isActiveWindow())
-+		{
-+			d->deactivationTickCount = GetTickCount();
-+		}
-+	}
-+#endif
-+
-+	if (event->type() == QEvent::ActivationChange ||
- 	    event->type() == QEvent::WindowStateChange)
- 	{
- 		if (d->mainTabs) {
-@@ -1606,18 +1630,42 @@ void MainWin::optionsUpdate()
- 	updateTray();
- }
- 
--void MainWin::toggleVisible()
-+void MainWin::toggleVisible(bool fromTray)
- {
--	if(!isHidden()) {
--		trayHide();
--	}
--	else {
--		trayShow();
-+	if (PsiOptions::instance()->getOption("options.ui.contactlist.raise-inactive").toBool())
-+	{
-+		bool hidden = false;
-+#ifdef Q_OS_WIN
-+		if (fromTray) {
-+			int timeout = 300;
-+			if (PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool())
-+				timeout += qApp->doubleClickInterval();
-+			hidden = isHidden() || (GetTickCount() - d->deactivationTickCount > timeout);
-+		}
-+		else {
-+			hidden = isHidden() || !isActiveWindow();
-+		}
-+#elif defined(HAVE_X11)
-+		Q_UNUSED(fromTray);
-+		hidden = isHidden() || X11WindowSystem::instance()->isWindowObscured(this, PsiOptions::instance()->getOption("options.ui.contactlist.always-on-top").toBool());
-+#else
-+		Q_UNUSED(fromTray);
-+		hidden = isHidden() || !isActiveWindow();
-+#endif
-+		if(hidden) {
-+			trayShow();
-+		}
-+		else {
-+			trayHide();
-+		}
- 	}
-+	else
-+		isHidden() ? trayShow() : trayHide();
- }
- 
- void MainWin::setTrayToolTip(const Status& status, bool, bool)
- {
-+	Q_UNUSED (status);
- 	if (!d->tray) {
- 		return;
- 	}
-@@ -1635,32 +1683,21 @@ void MainWin::trayClicked(const QPoint &, int button)
- 		return;
- 	}
- 
--	if(!isHidden()) {
--		trayHide();
--	}
--	else {
--		trayShow();
--	}
-+	toggleVisible(true);
- }
- 
- void MainWin::trayDoubleClicked()
- {
--	if(!PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool()) {
--		return;
--	}
-+	//Double click works like second single click now if "double-click" style is disabled
- 
--	if(d->nextAmount > 0) {
--		doRecvNextEvent();
--		return;
-+	if(PsiOptions::instance()->getOption("options.ui.systemtray.use-double-click").toBool()) {
-+		if(d->nextAmount > 0) {
-+			doRecvNextEvent();
-+			return;
-+		}
- 	}
- 
--
--	if(!isHidden()) {
--		trayHide();
--	}
--	else {
--		trayShow();
--	}
-+	toggleVisible(true);
- }
- 
- void MainWin::trayShow()
---- a/src/mainwin.h
-+++ b/src/mainwin.h
-@@ -180,7 +180,7 @@ public slots:
- 	void optionsUpdate();
- 	void setTrayToolTip(const XMPP::Status &, bool usePriority = false, bool isManualStatus = false);
- 
--	void toggleVisible();
-+	void toggleVisible(bool fromTray = false);
- 
- 	void avcallConfig();
- 
---- a/src/src.pri
-+++ b/src/src.pri
-@@ -349,6 +349,10 @@ SOURCES += \
- 	$$PWD/accountloginpassword.cpp \
- 	$$PWD/mcmdcompletion.cpp
- 
-+unix:!macx:!haiku {
-+	HEADERS += $$PWD/x11windowsystem.h
-+	SOURCES += $$PWD/x11windowsystem.cpp
-+}
- 
- CONFIG += filetransfer
- filetransfer {
-new file mode 100644
-index 0000000..ea1ae7d
---- /dev/null
-+++ b/src/x11windowsystem.cpp
-@@ -0,0 +1,215 @@
-+#include "x11windowsystem.h"
-+
-+#include <QX11Info>
-+#include <X11/Xlib.h>
-+
-+const long MAX_PROP_SIZE = 100000;
-+X11WindowSystem* X11WindowSystem::_instance = 0;
-+
-+X11WindowSystem::X11WindowSystem()
-+{
-+	const int atomsCount = 10;
-+	const char* names[atomsCount] = {
-+		"_NET_CLIENT_LIST_STACKING",
-+		"_NET_FRAME_EXTENTS",
-+
-+		"_NET_WM_WINDOW_TYPE",
-+		"_NET_WM_WINDOW_TYPE_NORMAL",
-+		"_NET_WM_WINDOW_TYPE_DIALOG",
-+		"_NET_WM_WINDOW_TYPE_UTILITY",
-+		"_NET_WM_WINDOW_TYPE_SPLASH",
-+

psi-plus-main-20160309.tar.xz/patches/0150-psi-options-language-select.diff Deleted

@@ -1,101 +0,0 @@
---- psi.orig/src/options/opt_application.cpp
-+++ psi/src/options/opt_application.cpp
-@@ -3,11 +3,16 @@
- #include "iconwidget.h"
- #include "psioptions.h"
- #include "proxy.h"
-+#include "translationmanager.h"
-+#include "varlist.h"
-+#include "applicationinfo.h"
- 
- #include <QCheckBox>
- #include <QComboBox>
- #include <QLineEdit>
-+#include "qsettings.h"
- #include <QList>
-+#include <QMessageBox>
- 
- #include "ui_opt_application.h"
- 
-@@ -101,6 +106,23 @@ void OptionsTabApplication::applyOptions
- 
- 	//Proxy
- 	ProxyManager::instance()->proxyForObject()->save();
-+
-+	// Language
-+	QString curLang = TranslationManager::instance()->currentLanguage();
-+	QString lang = d->cb_lang->currentText();
-+	QString itemData;
-+	foreach(VarListItem it, TranslationManager::instance()->availableTranslations() ) {
-+		if(it.data() == lang) {
-+			itemData = it.key();
-+			break;
-+		}
-+	}
-+	if(curLang != itemData && !itemData.isEmpty()) {
-+		TranslationManager::instance()->loadTranslation(itemData);
-+		QMessageBox::information(0, tr("Information"), tr("Some of the options you changed will only have full effect upon restart."));
-+	}
-+	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
-+	s.setValue("last_lang", itemData);
- }
- 
- void OptionsTabApplication::restoreOptions()
-@@ -123,6 +145,21 @@ void OptionsTabApplication::restoreOptio
- 	// data transfer
- 	d->le_dtPort->setText( QString::number(PsiOptions::instance()->getOption("options.p2p.bytestreams.listen-port").toInt()) );
- 	d->le_dtExternal->setText( PsiOptions::instance()->getOption("options.p2p.bytestreams.external-address").toString() );
-+
-+	// Language
-+	VarList vList = TranslationManager::instance()->availableTranslations();
-+	QStringList lang = vList.varsToStringList();
-+	d->cb_lang->addItem(tr("Default"));
-+	foreach(QString item, lang) {
-+		d->cb_lang->addItem(vList.get(item));
-+	}
-+	QString curLang = TranslationManager::instance()->currentLanguage();
-+	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
-+	QString curL = s.value("last_lang", "").toString();
-+	if (curL.isEmpty())
-+		d->cb_lang->setCurrentIndex( 0 );
-+	else if(!curLang.isEmpty() && lang.contains(curLang) )
-+		d->cb_lang->setCurrentIndex( d->cb_lang->findText(vList.get(curLang)) );
- }
- 
- void OptionsTabApplication::doEnableQuitOnClose(int state)
---- psi.orig/src/options/opt_application.ui
-+++ psi/src/options/opt_application.ui
-@@ -179,6 +179,33 @@
-     </widget>
-    </item>
-    <item>
-+    <layout class="QHBoxLayout" name="horizontalLayout">
-+     <item>
-+      <widget class="QLabel" name="label_2">
-+       <property name="text">
-+        <string>Language</string>
-+       </property>
-+      </widget>
-+     </item>
-+     <item>
-+      <widget class="QComboBox" name="cb_lang"/>
-+     </item>
-+     <item>
-+      <spacer name="horizontalSpacer">
-+       <property name="orientation">
-+        <enum>Qt::Horizontal</enum>
-+       </property>
-+       <property name="sizeHint" stdset="0">
-+        <size>
-+         <width>40</width>
-+         <height>20</height>
-+        </size>
-+       </property>
-+      </spacer>
-+     </item>
-+    </layout>
-+   </item>
-+   <item>
-     <spacer>
-      <property name="orientation" >
-       <enum>Qt::Vertical</enum>

psi-plus-main-20160309.tar.xz/patches/0160-psi-minimize-chat-hotkey.diff Deleted

@@ -1,104 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -601,6 +601,7 @@ QLineEdit#le_status_text {
- 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
- 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
- 				<show-messagePrev type="QKeySequence" comment="Show prev message" >Ctrl+Up</show-messagePrev>
-+				<minimize type="QKeySequence" comment="Minimize active chat window"/>
- 			</chat>
- 			<contactlist comment="Shortcuts in the contactlist">
- 				<assign-custom-avatar type="QKeySequence" comment="Assign a custom avatar to the selected contact"/>
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -224,6 +224,7 @@ public:
- //#endif
- 	QAction *act_send, *act_scrollup, *act_scrolldown, *act_close;
- 	QAction *act_mini_cmd, *act_nick, *act_hide, *act_copy_muc_jid;
-+	QAction *act_minimize;
- 
- 	MCmdSimpleSite mCmdSite;
- 	MCmdManager mCmdManager;
-@@ -786,6 +787,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	connect(bm, SIGNAL(conferencesChanged(QList<ConferenceBookmark>)), SLOT(updateBookmarkIcon()));
- 	connect(bm, SIGNAL(bookmarksSaved()), SLOT(updateBookmarkIcon()));
- 
-+	d->act_minimize = new QAction(this);
-+	connect(d->act_minimize, SIGNAL(triggered()), SLOT(doMinimize()));
-+	addAction(d->act_minimize);
-+
- 	int s = PsiIconset::instance()->system().iconSize();
- 	ui_.toolbar->setIconSize(QSize(s,s));
- 
-@@ -896,6 +901,11 @@ void GCMainDlg::horizSplitterMoved()
- 	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
- }
- 
-+void GCMainDlg::doMinimize()
-+{
-+	window()->showMinimized();
-+}
-+
- void GCMainDlg::ensureTabbedCorrectly()
- {
- 	TabbableWidget::ensureTabbedCorrectly();
-@@ -939,6 +949,7 @@ void GCMainDlg::setShortcuts()
- 	d->act_scrollup->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-up"));
- 	d->act_scrolldown->setShortcuts(ShortcutManager::instance()->shortcuts("common.scroll-down"));
- 	d->act_mini_cmd->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
-+	d->act_minimize->setShortcuts(ShortcutManager::instance()->shortcuts("chat.minimize"));
- }
- 
- void GCMainDlg::scrollUp()
---- psi.orig/src/groupchatdlg.h
-+++ psi/src/groupchatdlg.h
-@@ -141,6 +141,7 @@ private slots:
- #endif
- 	void chatEditCreated();
- 	void horizSplitterMoved();
-+	void doMinimize();
- 	void avatarUpdated(const Jid& jid);
- 
- public:
---- psi.orig/src/psichatdlg.cpp
-+++ psi/src/psichatdlg.cpp
-@@ -349,6 +349,11 @@ void PsiChatDlg::setShortcuts()
- 
- 	act_mini_cmd_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.quick-command"));
- 
-+	act_minimize_ = new QAction(this);
-+
-+	connect(act_minimize_, SIGNAL(triggered()), SLOT(doMinimize()));
-+	addAction(act_minimize_);
-+	act_minimize_->setShortcuts(ShortcutManager::instance()->shortcuts("chat.minimize"));
- }
- 
- void PsiChatDlg::updateIdentityVisibility()
-@@ -884,6 +889,10 @@ void PsiChatDlg::chatEditCreated()
- 	tabCompletion.setTextEdit(chatEdit());
- }
- 
-+void PsiChatDlg::doMinimize()
-+{
-+	window()->showMinimized();
-+}
- 
- void PsiChatDlg::doSend() {
- 	tabCompletion.reset();
---- psi.orig/src/psichatdlg.h
-+++ psi/src/psichatdlg.h
-@@ -36,6 +36,7 @@ private slots:
- 	void toggleSmallChat();
- 	void doClearButton();
- 	void doMiniCmd();
-+	void doMinimize();
- 	void addContact();
- 	void buildMenu();
- 	void updateCounter();
-@@ -85,6 +86,7 @@ private:
- 
- 	ActionList* actions_;
- 	QAction *act_mini_cmd_;
-+	QAction *act_minimize_;
- 	TypeAheadFindBar *typeahead_;
- 
- 	ActionLineEdit *le_autojid;

psi-plus-main-20160309.tar.xz/patches/0170-psi-add-bookmarks-to-join-conference-dlg.diff Deleted

@@ -1,173 +0,0 @@
---- psi.orig/src/mucjoin.ui
-+++ psi/src/mucjoin.ui
-@@ -27,7 +27,7 @@
-    <item row="0" column="1">
-     <widget class="AccountsComboBox" name="cb_ident"/>
-    </item>
--   <item row="1" column="0">
-+   <item row="2" column="0">
-     <widget class="QLabel" name="TextLabel1_2">
-      <property name="text">
-       <string>Recent:</string>
-@@ -37,7 +37,7 @@
-      </property>
-     </widget>
-    </item>
--   <item row="1" column="1">
-+   <item row="2" column="1">
-     <widget class="QComboBox" name="cb_recent">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-@@ -47,7 +47,7 @@
-      </property>
-     </widget>
-    </item>
--   <item row="2" column="0" colspan="2">
-+   <item row="4" column="0" colspan="2">
-     <widget class="QGroupBox" name="gb_info">
-      <property name="title">
-       <string>Room information</string>
-@@ -119,7 +119,7 @@
-      </layout>
-     </widget>
-    </item>
--   <item row="3" column="0" colspan="2">
-+   <item row="5" column="0" colspan="2">
-     <spacer>
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-@@ -135,7 +135,7 @@
-      </property>
-     </spacer>
-    </item>
--   <item row="4" column="0" colspan="2">
-+   <item row="6" column="0" colspan="2">
-     <widget class="Line" name="Line1">
-      <property name="frameShape">
-       <enum>QFrame::HLine</enum>
-@@ -148,16 +148,29 @@
-      </property>
-     </widget>
-    </item>
--   <item row="5" column="0">
-+   <item row="7" column="0">
-     <widget class="BusyWidget" name="busy" native="true"/>
-    </item>
--   <item row="5" column="1">
-+   <item row="7" column="1">
-     <widget class="QDialogButtonBox" name="buttonBox">
-      <property name="standardButtons">
-       <set>QDialogButtonBox::Cancel</set>
-      </property>
-     </widget>
-    </item>
-+   <item row="1" column="0">
-+    <widget class="QLabel" name="label">
-+     <property name="text">
-+      <string>Bookmarks:</string>
-+     </property>
-+     <property name="alignment">
-+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-+     </property>
-+    </widget>
-+   </item>
-+   <item row="1" column="1">
-+    <widget class="QComboBox" name="cb_bookmarks"/>
-+   </item>
-   </layout>
-  </widget>
-  <layoutdefault spacing="6" margin="11"/>
---- psi.orig/src/mucjoindlg.cpp
-+++ psi/src/mucjoindlg.cpp
-@@ -29,6 +29,7 @@
- #include "mucjoindlg.h"
- #include "psicontactlist.h"
- #include "groupchatdlg.h"
-+#include "bookmarkmanager.h"
- 
- static const int nickConflictCode = 409;
- static const QString additionalSymbol = "_";
-@@ -70,6 +71,7 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- 
- 	setWindowTitle(CAP(windowTitle()));
- 	connect(ui_.cb_recent, SIGNAL(activated(int)), SLOT(recent_activated(int)));
-+	connect(ui_.cb_bookmarks, SIGNAL(activated(int)), SLOT(bookmarksActivated(int)));
- 	if (!ui_.cb_recent->count()) {
- 		ui_.cb_recent->setEnabled(false);
- 		ui_.le_host->setFocus();
-@@ -77,6 +79,13 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- 	else {
- 		recent_activated(0);
- 	}
-+	if (!ui_.cb_bookmarks->count()) {
-+		ui_.cb_bookmarks->setEnabled(false);
-+		ui_.le_host->setFocus();
-+	}
-+	else {
-+		bookmarksActivated(0);
-+	}
- 
- 	setWidgetsEnabled(true);
- 	adjustSize();
-@@ -114,6 +123,8 @@ void MUCJoinDlg::updateIdentity(PsiAccou
- 		return;
- 	}
- 
-+	updateBookmarks(account_);
-+
- 	connect(account_, SIGNAL(disconnected()), this, SLOT(pa_disconnected()));
- }
- 
-@@ -142,6 +153,33 @@ void MUCJoinDlg::recent_activated(int x)
- 	ui_.le_nick->setText(jid.resource());
- }
- 
-+void MUCJoinDlg::bookmarksActivated(int x)
-+{
-+	Jid jid(ui_.cb_bookmarks->itemData(x).toString());
-+	if (jid.full().isEmpty())
-+		return;
-+
-+	ui_.le_host->setText(jid.domain());
-+	ui_.le_room->setText(jid.node());
-+	ui_.le_nick->setText(jid.resource());
-+}
-+
-+void MUCJoinDlg::updateBookmarks(PsiAccount *pa)
-+{
-+	ui_.cb_bookmarks->clear();
-+	if (pa && pa->bookmarkManager()->isAvailable()) {
-+		ui_.cb_bookmarks->setEnabled(true);
-+		foreach(ConferenceBookmark c, pa->bookmarkManager()->conferences()) {
-+			Jid jid = c.jid().withResource(c.nick());
-+			ui_.cb_bookmarks->addItem(JIDUtil::toString(jid, false));
-+			ui_.cb_bookmarks->setItemData(ui_.cb_bookmarks->count()-1, QVariant(jid.full()));
-+		}
-+	}
-+	else {
-+		ui_.cb_bookmarks->setEnabled(false);
-+	}
-+}
-+
- void MUCJoinDlg::doJoin(MucJoinReason r)
- {
- 	if (!account_ || !account_->checkConnected(this))
-@@ -197,6 +235,7 @@ void MUCJoinDlg::setWidgetsEnabled(bool
- {
- 	ui_.cb_ident->setEnabled(enabled);
- 	ui_.cb_recent->setEnabled(enabled && ui_.cb_recent->count() > 0);
-+	ui_.cb_bookmarks->setEnabled(enabled && ui_.cb_bookmarks->count() > 0);
- 	ui_.gb_info->setEnabled(enabled);
- 	joinButton_->setEnabled(enabled);
- }
---- psi.orig/src/mucjoindlg.h
-+++ psi/src/mucjoindlg.h
-@@ -68,6 +68,8 @@ private slots:
- 	void updateIdentityVisibility();
- 	void pa_disconnected();
- 	void recent_activated(int);
-+	void bookmarksActivated(int);
-+	void updateBookmarks(PsiAccount *pa);
- 
- private:
- 	Ui::MUCJoin ui_;

psi-plus-main-20160309.tar.xz/patches/0180-psiplus-decorate-windows.diff Deleted

@@ -1,1109 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -482,6 +482,7 @@ QLineEdit#le_status_text {
- 				</sounds>
- 				<successful-subscription type="bool">true</successful-subscription>
- 			</notifications>
-+			<decorate-windows type="bool">true</decorate-windows>
- 			<service-discovery>
- 				<automatically-get-info type="bool">false</automatically-get-info>
- 				<automatically-get-items type="bool">false</automatically-get-items>
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -87,6 +87,7 @@
- #include "mcmdmanager.h"
- #include "lastactivitytask.h"
- #include "psirichtext.h"
-+#include "psiwindowheader.h"
- 
- #include "mcmdsimplesite.h"
- 
-@@ -247,9 +248,13 @@ public:
- 
- 	int logSize;
- 	int rosterSize;
-+
- public:
- 	bool trackBar;
- 
-+	bool tabmode;
-+	PsiWindowHeader *winHeader_;
-+
- public:
- 	ChatEdit* mle() const { return dlg->ui_.mle->chatEdit(); }
- 	ChatView* te_log() const { return dlg->ui_.log; }
-@@ -677,6 +682,14 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	ui_.lb_ident->setAccount(account());
- 	ui_.lb_ident->setShowJid(false);
- 	ui_.log->setSessionData(true, jid().full(), jid().full()); //FIXME change conference name
-+	d->tabmode = PsiOptions::instance()->getOption("options.ui.tabs.use-tabs").toBool();
-+	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
-+	if (!d->tabmode && !isBorder()) {
-+		d->winHeader_ = new PsiWindowHeader(this);
-+		ui_.vboxLayout1->insertWidget(0, d->winHeader_);
-+	}
-+	setMargins();
-+
- #ifdef WEBKIT
- 	ui_.log->setAccount(account());
- #endif
-@@ -2185,6 +2198,25 @@ void GCMainDlg::resizeEvent(QResizeEvent
- 	QTimer::singleShot(0, this, SLOT(horizSplitterMoved()));
- }
- 
-+void GCMainDlg::setMargins()
-+{
-+	ui_.vboxLayout->setContentsMargins(0,0,0,0);
-+	ui_.vboxLayout2->setContentsMargins(4,0,4,4);
-+	if (!d->tabmode) {
-+		ui_.hboxLayout->setContentsMargins(4,0,4,0);
-+		if (!isBorder()) {
-+			ui_.vboxLayout1->setContentsMargins(0,0,0,0);
-+		}
-+		else {
-+			ui_.vboxLayout1->setContentsMargins(0,4,0,0);
-+		}
-+	}
-+	else {
-+		ui_.vboxLayout1->setContentsMargins(4,4,4,0);
-+		ui_.hboxLayout->setContentsMargins(2,0,4,0);
-+	}
-+}
-+
- //----------------------------------------------------------------------------
- // GCFindDlg
- //----------------------------------------------------------------------------
---- psi.orig/src/groupchatdlg.h
-+++ psi/src/groupchatdlg.h
-@@ -166,6 +166,8 @@ private:
- 
- 	inline XMPP::Jid jidForNick(const QString &nick) const;
- 
-+	void setMargins();
-+
- };
- 
- class GCFindDlg : public QDialog
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -135,6 +135,7 @@ public:
- 	int tabsSize;
- 	int rosterSize;
- 	bool isLeftRoster;
-+	bool isHide;
- 
- 	PopupAction* optionsButton, *statusButton;
- 	IconActionGroup* statusGroup, *viewGroups;
-@@ -584,6 +585,9 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 		connect(sp_ss, SIGNAL(triggered()), SLOT(avcallConfig()));*/
- 	optionChanged("options.ui.contactlist.css");
- 
-+	setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
-+	setMouseTracking(!isBorder());
-+
- 	reinitAutoHide();
- }
- 
-@@ -623,6 +627,11 @@ void MainWin::optionChanged(const QStrin
- 			setStyleSheet(css);
- 		}
- 	}
-+	else if (option == "options.ui.decorate-windows") {
-+		setWindowBorder(PsiOptions::instance()->getOption("options.ui.decorate-windows").toBool());
-+		setMouseTracking(!isBorder());
-+		show();
-+	}
- }
- 
- void MainWin::registerAction( IconAction* action )
-@@ -812,13 +821,19 @@ void MainWin::setWindowOpts(bool _onTop,
- 	d->onTop = _onTop;
- 	d->asTool = _asTool;
- 
--	Qt::WindowFlags flags = 0;
-+	Qt::WindowFlags flags = windowFlags();
- 	if(d->onTop) {
- 		flags |= Qt::WindowStaysOnTopHint;
- 	}
-+	else {
-+		flags &= ~Qt::WindowStaysOnTopHint;
-+	}
- 	if(d->asTool) {
- 		flags |= Qt::Tool | TOOLW_FLAGS;
- 	}
-+	else {
-+		flags &= ~Qt::Tool;
-+	}
- 
- 	setWindowFlags(flags);
- 	show();
-@@ -1783,6 +1798,7 @@ void MainWin::statusClicked(int x)
- {
- 	if(x == Qt::MidButton) {
- 		recvNextEvent();
-+		d->isHide = false;
- 	}
- }
- 
-@@ -2036,4 +2052,32 @@ void MainWin::resizeEvent(QResizeEvent *
- 	}
- }
- 
-+void MainWin::mousePressEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::MidButton && !isBorder()) {
-+		d->isHide = true;
-+	}
-+
-+	AdvancedWidget<QMainWindow>::mousePressEvent(e);
-+}
-+
-+void MainWin::mouseReleaseEvent(QMouseEvent *e)
-+{
-+	if (e->button() == Qt::MidButton && !isBorder() && d->isHide) {
-+		d->isHide = false;
-+		if (e->globalPos().x() >= geometry().left()
-+			&& e->globalPos().x() <= geometry().right()
-+			&& e->globalPos().y() >= geometry().top()
-+			&& e->globalPos().y() <= geometry().bottom()){
-+			if (d->asTool){
-+				d->mainWin->trayHide();
-+			} else {
-+				setWindowState(windowState() | Qt::WindowMinimized);
-+			}
-+		}
-+	}
-+
-+	AdvancedWidget<QMainWindow>::mouseReleaseEvent(e);
-+}
-+
- //#endif
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -26,6 +26,7 @@
- #include <QList>
- #include <QString>
- #include <QStringList>
-+#include <QMouseEvent>
- 
- #include "advwidget.h"
- #include "xmpp_status.h"
-@@ -88,6 +89,8 @@ protected:
- #ifdef Q_OS_WIN
- 	bool winEvent(MSG *, long *);
- #endif
-+	void mousePressEvent(QMouseEvent *e);
-+	void mouseReleaseEvent(QMouseEvent *e);
- 
- signals:
- 	void statusChanged(XMPP::Status::Type);

psi-plus-main-20160309.tar.xz/patches/0190-psi-colors-for-tabs.diff Deleted

@@ -1,32 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -403,6 +403,8 @@ QLineEdit#le_status_text {
- 					<chat>
- 						<link-color type="QColor">#0000ff</link-color>
- 						<mailto-color type="QColor">#0000ff</mailto-color>
-+						<composing-color type="QColor">darkGreen</composing-color>
-+						<unread-message-color type="QColor">red</unread-message-color>
- 					</chat>
- 					<passive-popup>
- 						<border type="QColor">#5297f9</border>
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -653,15 +653,15 @@ void TabDlg::updateTab(TabbableWidget* c
- 	//now set text colour based upon whether there are new messages/composing etc
- 
- 	if (chat->state() == TabbableWidget::StateComposing) {
--		tabWidget_->setTabTextColor(chat, Qt::darkGreen);
-+		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.composing-color").value<QColor>());
- 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/typing")->icon());
- 	}
- 	else if (chat->unreadMessageCount()) {
--		tabWidget_->setTabTextColor(chat, Qt::red);
-+		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
- 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
- 	}
- 	else {
--		tabWidget_->setTabTextColor(chat, palette().windowText().color());
-+		tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
- 		tabWidget_->setTabIcon(chat, chat->icon());
- 	}
- 	updateCaption();

psi-plus-main-20160309.tar.xz/patches/0200-psi-chatview-quote-feature.diff Deleted

@@ -1,408 +0,0 @@
---- psi.orig/src/chatview_te.cpp
-+++ psi/src/chatview_te.cpp
-@@ -35,6 +35,8 @@
- #include <QTimer>
- #include <QKeyEvent>
- #include <QUrl>
-+#include <QMenu>
-+#include <QTextDocumentFragment>
- 
- static const char *informationalColorOpt = "options.ui.look.colors.messages.informational";
- 
-@@ -59,6 +61,12 @@ ChatView::ChatView(QWidget *parent)
- 	connect(this, SIGNAL(selectionChanged()), SLOT(autoCopy()));
- 	connect(this, SIGNAL(cursorPositionChanged()), SLOT(autoCopy()));
- #endif
-+	actQuote_ = new QAction(tr("Quote"), this);
-+	actQuote_->setEnabled(false);
-+	actQuote_->setShortcut(QKeySequence(tr("Ctrl+S")));
-+	addAction(actQuote_);
-+	connect(actQuote_, SIGNAL(triggered()), SLOT(quoteEvent()));
-+	connect(this, SIGNAL(selectionChanged()), SLOT(changeActQuoteState()));
- 
- 	useMessageIcons_ = PsiOptions::instance()->getOption("options.ui.chat.use-message-icons").toBool();
- 	if (useMessageIcons_) {
-@@ -135,10 +143,20 @@ void ChatView::contextMenuEvent(QContext
- 		e->accept();
- 	}
- 	else {
--		PsiTextView::contextMenuEvent(e);
-+		QMenu *menu = createStandardContextMenu(e->pos());
-+		menu->exec(e->globalPos());
-+		delete menu;
-+		e->accept();
- 	}
- }
- 
-+QMenu* ChatView::createStandardContextMenu(const QPoint &position)
-+{
-+	QMenu *menu = PsiTextView::createStandardContextMenu(position);
-+	menu->addAction(actQuote_);
-+	return menu;
-+}
-+
- void ChatView::addLogIconsResources()
- {
- 	document()->addResource(QTextDocument::ImageResource, QUrl("icon:log_icon_receive"), logIconReceive);
-@@ -203,6 +221,24 @@ void ChatView::autoCopy()
- }
- 
- /**
-+ * Make quote from any selected text and paste it in chat window
-+ */
-+
-+void ChatView::quoteEvent()
-+{
-+	emit quote(getPlainText());
-+}
-+
-+/**
-+ * Enable or disable actQuote_ in relations from hasSelection()
-+ */
-+
-+void ChatView::changeActQuoteState()
-+{
-+	actQuote_->setEnabled(textCursor().hasSelection());
-+}
-+
-+/**
-  * Handle KeyPress events that happen in ChatEdit widget. This is used
-  * to 'fix' the copy shortcut.
-  * \param object object that should receive the event
---- psi.orig/src/chatview_te.h
-+++ psi/src/chatview_te.h
-@@ -47,6 +47,7 @@ public:
- 	QSize sizeHint() const;
- 	void clear();
- 	void contextMenuEvent(QContextMenuEvent *e);
-+	QMenu* createStandardContextMenu(const QPoint &position);
- 
- 	void init();
- 	void setDialog(QWidget* dialog);
-@@ -85,12 +86,15 @@ protected:
- 
- protected slots:
- 	void autoCopy();
-+	void quoteEvent();
-+	void changeActQuoteState();
- 
- private slots:
- 	void slotScroll();
- 
- signals:
- 	void showNM(const QString&);
-+	void quote(const QString &text);
- 
- private:
- 	bool isMuc_;
-@@ -109,6 +113,7 @@ private:
- 	QPixmap logIconDeliveredPgp;
- 	QPixmap logIconTime;
- 	QPixmap logIconInfo;
-+	QAction *actQuote_;
- };
- 
- #endif
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -881,6 +881,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	invalidateTab();
- 	setConnecting();
- 
-+	connect(ui_.log->textWidget(), SIGNAL(quote(const QString &)), ui_.mle->chatEdit(), SLOT(insertAsQuote(const QString &)));
- 	connect(pa->avatarFactory(), SIGNAL(avatarChanged(Jid)), SLOT(avatarUpdated(Jid)));
- }
- 
---- psi.orig/src/msgmle.cpp
-+++ psi/src/msgmle.cpp
-@@ -33,6 +33,7 @@
- #include <QTextDocument>
- #include <QTimer>
- #include <QMimeData>
-+#include <QClipboard>
- 
- #include "shortcutmanager.h"
- #include "spellchecker/spellhighlighter.h"
-@@ -93,6 +94,13 @@ void ChatEdit::initActions()
- 	act_showMessageLast= new QAction(this);
- 	addAction(act_showMessageLast);
- 	connect(act_showMessageLast, SIGNAL(triggered()), SLOT(showHistoryMessageLast()));
-+
-+	QClipboard *clipboard = QApplication::clipboard();
-+	actPasteAsQuote_ = new QAction(tr("Paste as Quotation"), this);
-+	actPasteAsQuote_->setEnabled(clipboard->mimeData()->hasText());
-+	addAction(actPasteAsQuote_);
-+	connect(actPasteAsQuote_, SIGNAL(triggered()), SLOT(pasteAsQuote()));
-+	connect(clipboard, SIGNAL(dataChanged()), SLOT(changeActPasteAsQuoteState()));
- }
- 
- void ChatEdit::setShortcuts()
-@@ -119,6 +127,13 @@ void ChatEdit::setFont(const QFont &f)
- 	controller_->setFont(f);
- }
- 
-+QMenu* ChatEdit::createStandardContextMenu(const QPoint &position)
-+{
-+	QMenu *menu = QTextEdit::createStandardContextMenu(position);
-+	menu->addAction(actPasteAsQuote_);
-+	return menu;
-+}
-+
- bool ChatEdit::checkSpellingGloballyEnabled()
- {
- 	return (SpellChecker::instance()->available() && PsiOptions::instance()->getOption("options.ui.spell-check.enabled").toBool());
-@@ -223,8 +238,10 @@ void ChatEdit::contextMenuEvent(QContext
- 		}
- 	}
- 
--	// Do normal menu
--	QTextEdit::contextMenuEvent(e);
-+	// Do custom menu
-+	QMenu *menu = createStandardContextMenu(e->pos());
-+	menu->exec(e->globalPos());
-+	delete menu;
- 	e->accept();
- }
- 
-@@ -299,6 +316,18 @@ void ChatEdit::showHistoryMessageNext()
- 	}
- }
- 
-+void ChatEdit::changeActPasteAsQuoteState()
-+{
-+	QClipboard *clipboard = QApplication::clipboard();
-+	actPasteAsQuote_->setEnabled(clipboard->mimeData()->hasText());
-+}
-+
-+void ChatEdit::pasteAsQuote()
-+{
-+	QString text = QApplication::clipboard()->mimeData()->text();
-+	insertAsQuote(text);
-+}
-+
- void ChatEdit::showHistoryMessagePrev()
- {
- 	if (!typedMsgsHistory.isEmpty() && typedMsgsIndex > 0) {
-@@ -408,6 +437,24 @@ void ChatEdit::setCssString(const QStrin
- 	controller_->setCssString(css);
- }
- 
-+void ChatEdit::insertAsQuote(const QString &text)
-+{
-+	int pos =  textCursor().position();
-+	QString prevLine = toPlainText().left(pos - 1);
-+	prevLine = prevLine.mid(prevLine.lastIndexOf("\n") + 1);
-+
-+	QString quote = QString::fromUtf8("» ") + text;
-+	quote.replace("\n", QString::fromUtf8("\n» "));
-+
-+	// Check for previous quote and merge if true

psi-plus-main-20160309.tar.xz/patches/0210-psi-vert-splitter-position.diff Deleted

@@ -1,266 +0,0 @@
---- a/options/default.xml
-+++ b/options/default.xml
-@@ -123,6 +123,8 @@
- 				<css type="QString" />
- 				<hide-when-closing type="bool">false</hide-when-closing>
- 				<status-with-priority comment="Show priority with status change" type="bool">false</status-with-priority>
-+				<log-height type="int">325</log-height>
-+				<chatedit-height type="int">10</chatedit-height>
- 				<default-jid-mode comment="Default jid mode: barejid | auto" type="QString">barejid</default-jid-mode>
- 				<default-jid-mode-ignorelist comment="Default autojid mode ignore list: jid1,jid2,..." type="QString"></default-jid-mode-ignorelist>
- 			</chat>
---- a/src/chatsplitter.cpp
-+++ b/src/chatsplitter.cpp
-@@ -75,6 +75,15 @@ void ChatSplitter::setSizes(const QList<int>& list)
- 		splitter_->setSizes(list);
- }
- 
-+QList<int> ChatSplitter::sizes()
-+{
-+	QList<int> list;
-+	if(splitter_)
-+		list = splitter_->sizes();
-+
-+	return list;
-+}
-+
- /**
-  * Moves \a child either to the real QSplitter, or adds it to the
-  * private layout.
-@@ -130,6 +139,8 @@ void ChatSplitter::updateLayout()
- 
- 	foreach(QWidget* child, children_)
- 		updateChildLayout(child);
-+
-+	connect(splitter_, SIGNAL(splitterMoved(int,int)), SIGNAL(splitterMoved(int,int)));
- }
- 
- /**
---- a/src/chatsplitter.h
-+++ b/src/chatsplitter.h
-@@ -35,6 +35,7 @@ public:
- 	void setOrientation(Qt::Orientation orientation);
- 	void addWidget(QWidget* widget);
- 	void setSizes(const QList<int>& list);
-+	QList<int> sizes();
- 
- protected:
- 	/**
-@@ -49,6 +50,9 @@ public slots:
- private slots:
- 	void childDestroyed(QObject* obj);
- 
-+signals:
-+	void splitterMoved(int,int);
-+
- private:
- 	void updateChildLayout(QWidget* child);
- 	void updateLayout();
---- a/src/groupchatdlg.cpp
-+++ b/src/groupchatdlg.cpp
-@@ -249,6 +249,9 @@ public:
- 	int logSize;
- 	int rosterSize;
- 
-+	int logHeight;
-+	int chateditHeight;
-+
- public:
- 	bool trackBar;
- 
-@@ -844,6 +847,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 	ui_.tb_actions->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
- 
- 	connect(ui_.hsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(horizSplitterMoved()));
-+	connect(ui_.vsplitter, SIGNAL(splitterMoved(int,int)), this, SLOT(verticalSplitterMoved(int,int)));
- 
- 	// resize the horizontal splitter
- 	d->logSize = PsiOptions::instance()->getOption("options.ui.muc.log-width").toInt();
-@@ -861,10 +865,9 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 		ui_.hsplitter->insertWidget(0, ui_.lv_users);  // Swap widgets
- 
- 	// resize the vertical splitter
--	list.clear();
--	list << 324;
--	list << 10;
--	ui_.vsplitter->setSizes(list);
-+	d->logHeight = PsiOptions::instance()->getOption("options.ui.chat.log-height").toInt();
-+	d->chateditHeight = PsiOptions::instance()->getOption("options.ui.chat.chatedit-height").toInt();
-+	setVSplitterPosition(d->logHeight, d->chateditHeight);
- 
- 	X11WM_CLASS("groupchat");
- 
-@@ -915,6 +918,26 @@ void GCMainDlg::horizSplitterMoved()
- 	PsiOptions::instance()->setOption("options.ui.muc.roster-width", d->rosterSize);
- }
- 
-+void GCMainDlg::verticalSplitterMoved(int, int)
-+{
-+	QList<int> list = ui_.vsplitter->sizes();
-+	d->logHeight = list.first();
-+	d->chateditHeight = list.last();
-+	PsiOptions::instance()->setOption("options.ui.chat.log-height", d->logHeight);
-+	PsiOptions::instance()->setOption("options.ui.chat.chatedit-height", d->chateditHeight);
-+
-+	emit vSplitterMoved(d->logHeight, d->chateditHeight);
-+}
-+
-+void GCMainDlg::setVSplitterPosition(int log,int chat)
-+{
-+	QList<int> list;
-+	d->logHeight = log;
-+	d->chateditHeight = chat;
-+	list << log << chat;
-+	ui_.vsplitter->setSizes(list);
-+}
-+
- void GCMainDlg::doMinimize()
- {
- 	window()->showMinimized();
---- a/src/groupchatdlg.h
-+++ b/src/groupchatdlg.h
-@@ -85,6 +85,7 @@ public:
- 	virtual TabbableWidget::State state() const;
- 	virtual int unreadMessageCount() const;
- 	virtual QString desiredCaption() const;
-+	virtual void setVSplitterPosition(int log,int chat);
- 
- protected:
- 	void setShortcuts();
-@@ -141,6 +142,7 @@ private slots:
- #endif
- 	void chatEditCreated();
- 	void horizSplitterMoved();
-+	void verticalSplitterMoved(int, int);
- 	void doMinimize();
- 	void avatarUpdated(const Jid& jid);
- 
---- a/src/psichatdlg.cpp
-+++ b/src/psichatdlg.cpp
-@@ -249,10 +249,11 @@ void PsiChatDlg::initUi()
- 
- 	connect(account()->client()->capsManager(), SIGNAL(capsChanged(const Jid&)), SLOT(capsChanged(const Jid&)));
- 
--	QList<int> list;
--	list << 324;
--	list << 96;
--	ui_.splitter->setSizes(list);
-+	logHeight = PsiOptions::instance()->getOption("options.ui.chat.log-height").toInt();
-+	chateditHeight = PsiOptions::instance()->getOption("options.ui.chat.chatedit-height").toInt();
-+	setVSplitterPosition(logHeight, chateditHeight);
-+
-+	connect(ui_.splitter, SIGNAL(splitterMoved(int,int)), this, SLOT(verticalSplitterMoved(int,int)));
- 
- 	smallChat_ = PsiOptions::instance()->getOption("options.ui.chat.use-small-chats").toBool();
-  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
-@@ -278,6 +279,26 @@ void PsiChatDlg::initUi()
- 	unacked_messages = 0;
- }
- 
-+void PsiChatDlg::verticalSplitterMoved(int, int)
-+{
-+	QList<int> list = ui_.splitter->sizes();
-+	logHeight = list.first();
-+	chateditHeight = list.last();
-+	PsiOptions::instance()->setOption("options.ui.chat.log-height", logHeight);
-+	PsiOptions::instance()->setOption("options.ui.chat.chatedit-height", chateditHeight);
-+
-+	emit vSplitterMoved(logHeight, chateditHeight);
-+}
-+
-+void PsiChatDlg::setVSplitterPosition(int log,int chat)
-+{
-+	QList<int> list;
-+	logHeight = log;
-+	chateditHeight = chat;
-+	list << log << chat;
-+	ui_.splitter->setSizes(list);
-+}
-+
- void PsiChatDlg::updateCountVisibility()
- {
- 	if (PsiOptions::instance()->getOption("options.ui.message.show-character-count").toBool() && !smallChat_) {
---- a/src/psichatdlg.h
-+++ b/src/psichatdlg.h
-@@ -23,6 +23,8 @@ class PsiChatDlg : public ChatDlg
- public:
- 	PsiChatDlg(const Jid& jid, PsiAccount* account, TabManager* tabManager);
- 
-+	virtual void setVSplitterPosition(int log,int chat);
-+
- protected:
- 	// reimplemented
- 	void contextMenuEvent(QContextMenuEvent *);
-@@ -45,6 +47,7 @@ private slots:
- 	void updateCountVisibility();
- 	void updateContactAdding(PsiContact* c = 0);
- 	void updateContactAdding(const Jid &j);
-+	void verticalSplitterMoved(int, int);
- 	void contactChanged();

psi-plus-main-20160309.tar.xz/patches/0220-psi-auto-capitalizer.diff Deleted

@@ -1,239 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -110,6 +110,7 @@
- 				</avatars>
- 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
- 				<auto-popup type="bool">false</auto-popup>
-+				<auto-capitalize type="bool">false</auto-capitalize>
- 				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<switch-tab-on-new-messages type="bool">false</switch-tab-on-new-messages>
-@@ -606,6 +607,7 @@ QLineEdit#le_status_text {
- 				<show-messageFirst type="QKeySequence" comment="Show first message" >Alt+End</show-messageFirst>
- 				<show-messageNext type="QKeySequence" comment="Show next message" >Ctrl+Down</show-messageNext>
- 				<show-messagePrev type="QKeySequence" comment="Show prev message" >Ctrl+Up</show-messagePrev>
-+				<change-case type="QKeySequence" comment="Change case of letters in the chat edit" >Ctrl+Alt+x</change-case>
- 				<minimize type="QKeySequence" comment="Minimize active chat window"/>
- 			</chat>
- 			<contactlist comment="Shortcuts in the contactlist">
---- psi.orig/src/msgmle.cpp
-+++ psi/src/msgmle.cpp
-@@ -41,6 +41,126 @@
- #include "psioptions.h"
- #include "htmltextcontroller.h"
- 
-+#include "qdebug.h"
-+
-+//----------------------------------------------------------------------------
-+// CapitalLettersController
-+//----------------------------------------------------------------------------
-+
-+class CapitalLettersController : public QObject
-+{
-+	Q_OBJECT
-+public:
-+	CapitalLettersController(QTextEdit* parent)
-+		: QObject()
-+		, te_(parent)
-+		, enabled_(true)
-+	{
-+		connect(te_->document(), SIGNAL(contentsChange(int,int,int)), SLOT(textChanged(int,int,int)));
-+	}
-+
-+	virtual ~CapitalLettersController() {};
-+
-+	void setAutoCapitalizeEnabled(bool enabled)
-+	{
-+		enabled_ = enabled;
-+	}
-+
-+private:
-+	void capitalizeChar(int pos, QChar c)
-+	{
-+		changeChar(pos, c.toUpper());
-+	}
-+
-+	void decapitalizeChar(int pos, QChar c)
-+	{
-+		changeChar(pos, c.toLower());
-+	}
-+
-+	void changeChar(int pos, QChar c)
-+	{
-+		QTextCursor cur = te_->textCursor();
-+		cur.setPosition(pos+1);
-+		const QTextCharFormat cf = cur.charFormat();
-+		cur.deletePreviousChar();
-+		cur.setCharFormat(cf);
-+		cur.insertText(c);
-+	}
-+
-+public slots:
-+	void textChanged(int pos, int /*charsRemoved*/, int charsAdded)
-+	{
-+		if(enabled_) {
-+			if(charsAdded == 0) {
-+				return;
-+			}
-+			if(!te_->textCursor().atEnd()) { //Editing the letter in the middle of the text
-+				return;
-+			}
-+			bool capitalizeNext_ = false;
-+
-+			if(pos == 0 && charsAdded < 3) { //the first letter after the previous message was sent
-+				capitalizeNext_ = true;
-+			}
-+			else if (charsAdded > 1) { //Insert a piece of text
-+				return;
-+			}
-+			else {
-+				QString txt = te_->toPlainText();
-+				QRegExp capitalizeAfter("(?:^[^.][.]+\\s+)|(?:\\s*[^.]{2,}[.]+\\s+)|(?:[!?]\\s+)");
-+				int index = txt.lastIndexOf(capitalizeAfter);
-+				if(index != -1 && index == pos-capitalizeAfter.matchedLength()) {
-+					capitalizeNext_ = true;
-+				}
-+			}
-+
-+			if(capitalizeNext_) {
-+				QChar ch = te_->document()->characterAt(pos);
-+				if(!ch.isLetter() || !ch.isLower()) {
-+					return;
-+				}
-+				else {
-+					capitalizeChar(pos, ch);
-+				}
-+			}
-+		}
-+	}
-+
-+	void changeCase()
-+	{
-+		bool tmpEnabled = enabled_;
-+		enabled_ = false;
-+		QTextCursor oldCur = te_->textCursor();
-+		int pos = oldCur.position();
-+		int begin = 0;
-+		int end = te_->document()->characterCount();
-+		if(oldCur.hasSelection()) {
-+			begin = oldCur.selectionStart();
-+			end = oldCur.selectionEnd();
-+		}
-+		for(; begin < end; begin++) {
-+			QChar ch = te_->document()->characterAt(begin);
-+			if(!ch.isLetter()) {
-+				continue;
-+			}
-+
-+			if(ch.isLower()) {
-+				capitalizeChar(begin, ch);
-+			}
-+			else {
-+				decapitalizeChar(begin, ch);
-+			}
-+		}
-+		oldCur.setPosition(pos);
-+		te_->setTextCursor(oldCur);
-+		enabled_ = tmpEnabled;
-+	}
-+
-+private:
-+	QTextEdit* te_;
-+	bool enabled_;
-+};
-+
- 
- //----------------------------------------------------------------------------
- // ChatEdit
-@@ -52,6 +172,7 @@ ChatEdit::ChatEdit(QWidget *parent)
- 	, spellhighlighter_(0)
- {
- 	controller_ = new HTMLTextController(this);
-+	capitalizer_ = new CapitalLettersController(this);
- 
- 	setWordWrapMode(QTextOption::WordWrap);
- 	setAcceptRichText(false);
-@@ -68,6 +189,7 @@ ChatEdit::ChatEdit(QWidget *parent)
- 
- 	initActions();
- 	setShortcuts();
-+	optionsChanged();
- }
- 
- ChatEdit::~ChatEdit()
-@@ -75,6 +197,12 @@ ChatEdit::~ChatEdit()
- 	clearMessageHistory();
- 	delete spellhighlighter_;
- 	delete controller_;
-+	delete capitalizer_;
-+}
-+
-+CapitalLettersController * ChatEdit::capitalizer()
-+{
-+	return capitalizer_;
- }
- 
- void ChatEdit::initActions()
-@@ -101,6 +229,10 @@ void ChatEdit::initActions()
- 	addAction(actPasteAsQuote_);
- 	connect(actPasteAsQuote_, SIGNAL(triggered()), SLOT(pasteAsQuote()));
- 	connect(clipboard, SIGNAL(dataChanged()), SLOT(changeActPasteAsQuoteState()));
-+
-+	act_changeCase = new QAction(this);
-+	addAction(act_changeCase);
-+	connect(act_changeCase, SIGNAL(triggered()), capitalizer_, SLOT(changeCase()));
- }
- 
- void ChatEdit::setShortcuts()
-@@ -109,6 +241,7 @@ void ChatEdit::setShortcuts()
- 	act_showMessageNext->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageNext"));
- 	act_showMessageFirst->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageFirst"));
- 	act_showMessageLast->setShortcuts(ShortcutManager::instance()->shortcuts("chat.show-messageLast"));
-+	act_changeCase->setShortcuts(ShortcutManager::instance()->shortcuts("chat.change-case"));
- }
- 
- void ChatEdit::setDialog(QWidget* dialog)
-@@ -298,6 +431,7 @@ void ChatEdit::addToDictionary()
- void ChatEdit::optionsChanged()
- {
- 	setCheckSpelling(checkSpellingGloballyEnabled());

psi-plus-main-20160309.tar.xz/patches/0230-psi-autostart.diff Deleted

@@ -1,139 +0,0 @@
---- psi.orig/src/applicationinfo.cpp
-+++ psi/src/applicationinfo.cpp
-@@ -383,3 +383,28 @@ QString ApplicationInfo::currentProfileD
- {
- 	return pathToProfile(activeProfile, type);
- }
-+
-+QString ApplicationInfo::desktopFile()
-+{
-+	QString dFile;
-+	const QString execFileName = QFileInfo(qApp->applicationFilePath()).fileName();
-+	const QString desktopFile = QString("/usr/share/applications/%1.desktop").arg(execFileName);
-+	QFile f(desktopFile);
-+	if(f.open(QIODevice::ReadOnly)) {
-+		dFile = QString::fromUtf8(f.readAll());
-+	}
-+	else {
-+		dFile = "[Desktop Entry]\n";
-+		dFile += "Version=1.0\n";
-+		dFile += "Type=Application\n";
-+		dFile += QString("Name=%1\n").arg(name());
-+		dFile += "GenericName=Jabber Client\n";
-+		dFile += "Comment=Communicate over the Jabber network\n";
-+		dFile += QString("Icon=%1\n").arg(execFileName);
-+		dFile += QString("Exec=%1\n").arg(execFileName);
-+		dFile += "Terminal=false\n";
-+		dFile += "Categories=Network;InstantMessaging;Qt;";
-+	}
-+
-+	return dFile;
-+}
---- psi.orig/src/applicationinfo.h
-+++ psi/src/applicationinfo.h
-@@ -44,6 +44,9 @@ public:
- 	static QString optionsNS();
- 	static QString storageNS();
- 	static QString fileCacheNS();
-+
-+	// Common
-+	static QString desktopFile();
- };
- 
- #endif
---- psi.orig/src/options/opt_application.cpp
-+++ psi/src/options/opt_application.cpp
-@@ -13,9 +13,17 @@
- #include "qsettings.h"
- #include <QList>
- #include <QMessageBox>
-+#include <QDir>
- 
- #include "ui_opt_application.h"
- 
-+#ifdef Q_OS_WIN
-+	static const QString regString = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
-+#endif
-+#ifdef HAVE_X11
-+	static const QString psiAutoStart = "/.config/autostart/psi-plus.desktop";
-+#endif
-+
- class OptApplicationUI : public QWidget, public Ui::OptApplication
- {
- public:
-@@ -60,6 +68,7 @@ QWidget *OptionsTabApplication::widget()
- 
- #ifdef Q_OS_MAC
- 	d->gb_docklet->hide();
-+	d->ck_auto_load->hide();
- #endif
- 
- 	if (!haveAutoUpdater_) {
-@@ -126,6 +135,29 @@ void OptionsTabApplication::applyOptions
- 	}
- 	QSettings s(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/psirc", QSettings::IniFormat);
- 	s.setValue("last_lang", itemData);
-+
-+	//Auto-load
-+#ifdef Q_OS_WIN
-+	QSettings set(regString, QSettings::NativeFormat);
-+	if(d->ck_auto_load->isChecked()) {
-+		set.setValue(ApplicationInfo::name(), QDir::toNativeSeparators(qApp->applicationFilePath()));
-+	}
-+	else {
-+		set.remove(ApplicationInfo::name());
-+	}
-+#endif
-+#ifdef HAVE_X11
-+	QDir home = QDir::home();
-+	if (!home.exists(".config/autostart")) {
-+		home.mkpath(".config/autostart");
-+	}
-+	QFile f(home.absolutePath() + psiAutoStart);
-+	if (f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
-+		const QString contents = ApplicationInfo::desktopFile().trimmed();
-+		f.write(contents.toUtf8());
-+		f.write(QString("\nHidden=%1").arg(d->ck_auto_load->isChecked() ? "false\n" : "true\n").toUtf8());
-+	}
-+#endif
- }
- 
- void OptionsTabApplication::restoreOptions()
-@@ -164,6 +196,21 @@ void OptionsTabApplication::restoreOptio
- 		d->cb_lang->setCurrentIndex( 0 );
- 	else if(!curLang.isEmpty() && lang.contains(curLang) )
- 		d->cb_lang->setCurrentIndex( d->cb_lang->findText(vList.get(curLang)) );
-+
-+	//Auto-load
-+#ifdef Q_OS_WIN
-+	QSettings set(regString, QSettings::NativeFormat);
-+	const QString path = set.value(ApplicationInfo::name()).toString();
-+	d->ck_auto_load->setChecked( (path == QDir::toNativeSeparators(qApp->applicationFilePath())) );
-+#endif
-+#ifdef HAVE_X11
-+	QFile desktop(QDir::homePath() + psiAutoStart);
-+	if (desktop.open(QIODevice::ReadOnly)
-+		&& QString(desktop.readAll()).contains(QRegExp("\\bhidden\\s*=\\s*false", Qt::CaseInsensitive)))
-+	{
-+		d->ck_auto_load->setChecked(true);
-+	}
-+#endif
- }
- 
- void OptionsTabApplication::doEnableQuitOnClose(int state)
---- psi.orig/src/options/opt_application.ui
-+++ psi/src/options/opt_application.ui
-@@ -14,6 +14,13 @@
-   </property>
-   <layout class="QVBoxLayout" >
-    <item>
-+    <widget class="QCheckBox" name="ck_auto_load">
-+     <property name="text">
-+      <string>Automatically launch application when OS starts</string>
-+     </property>
-+    </widget>
-+   </item>
-+   <item>
-     <widget class="QCheckBox" name="ck_docklet" >
-      <property name="text" >
-       <string>Enable docklet</string>

psi-plus-main-20160309.tar.xz/patches/0240-psi-fix-psitooltiphandler.diff Deleted

@@ -1,47 +0,0 @@
---- psi.orig/src/widgets/psitooltip.cpp
-+++ psi/src/widgets/psitooltip.cpp
-@@ -40,7 +40,6 @@ class PsiToolTipHandler : public QObject
- public:
- 	static PsiToolTipHandler *getInstance()
- 	{
--		static PsiToolTipHandler *instance = 0;
- 		if (!instance)
- 			instance = new PsiToolTipHandler();
- 
-@@ -49,8 +48,10 @@ public:
- 
- 	void install(QWidget *widget)
- 	{
-+		if(!watchedWidgets_.contains(widget)) {
-+			connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)));
-+		}
- 		watchedWidgets_[widget] = true;
--		connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)));
- 	}
- 
- private slots:
-@@ -58,10 +59,15 @@ private slots:
- 	{
- 		QWidget* widget = static_cast<QWidget*>(obj);
- 		watchedWidgets_.remove(widget);
-+		if(watchedWidgets_.isEmpty()) {
-+			instance->deleteLater();
-+			instance = 0;
-+		}
- 	}
- 
- private:
- 	QHash<QWidget*, bool> watchedWidgets_;
-+	static PsiToolTipHandler *instance;
- 
- 	PsiToolTipHandler()
- 		: QObject(qApp)
-@@ -87,6 +93,8 @@ private:
- 	}
- };
- 
-+PsiToolTipHandler* PsiToolTipHandler::instance = 0;
-+
- //----------------------------------------------------------------------------
- // ToolTipPosition
- //----------------------------------------------------------------------------

psi-plus-main-20160309.tar.xz/patches/0250-psi-disable-auto-scroll-to-bottom.diff Deleted

@@ -1,30 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -111,6 +111,7 @@
- 				<alert-for-already-open-chats type="bool">true</alert-for-already-open-chats>
- 				<auto-popup type="bool">false</auto-popup>
- 				<auto-capitalize type="bool">false</auto-capitalize>
-+				<auto-scroll-to-bottom type="bool">true</auto-scroll-to-bottom>
- 				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<switch-tab-on-new-messages type="bool">false</switch-tab-on-new-messages>
---- psi.orig/src/chatview_te.cpp
-+++ psi/src/chatview_te.cpp
-@@ -361,7 +361,7 @@ void ChatView::renderMucMessage(const Me
- 		}
- 	}
- 
--	if(mv.isLocal()) {
-+	if(mv.isLocal() && PsiOptions::instance()->getOption("options.ui.chat.auto-scroll-to-bottom").toBool() ) {
- 		scrollToBottom();
- 	}
- }
-@@ -390,7 +390,7 @@ void ChatView::renderMessage(const Messa
- 		}
- 	}
- 
--	if (mv.isLocal()) {
-+	if (mv.isLocal() && PsiOptions::instance()->getOption("options.ui.chat.auto-scroll-to-bottom").toBool() ) {
- 		deferredScroll();
- 	}
- }

psi-plus-main-20160309.tar.xz/patches/0260-psi-tab-highlight-color.diff Deleted

@@ -1,79 +0,0 @@
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -1127,9 +1127,15 @@ void ChatDlg::chatEditCreated()
- 
- TabbableWidget::State ChatDlg::state() const
- {
--	return contactChatState_ == XMPP::StateComposing ?
--		   TabbableWidget::StateComposing :
--		   TabbableWidget::StateNone;
-+	TabbableWidget::State state = TabbableWidget::StateNone;
-+	if(contactChatState_ == XMPP::StateComposing) {
-+		state = TabbableWidget::StateComposing;
-+	}
-+	else if(unreadMessageCount()) {
-+		state = TabbableWidget::StateHighlighted;
-+	}
-+
-+	return state;
- }
- 
- int ChatDlg::unreadMessageCount() const
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -2182,7 +2182,7 @@ void GCMainDlg::chatEditCreated()
- 
- TabbableWidget::State GCMainDlg::state() const
- {
--	return TabbableWidget::StateNone;
-+	return d->hPending ? TabbableWidget::StateHighlighted : TabbableWidget::StateNone;
- }
- 
- int GCMainDlg::unreadMessageCount() const
---- psi.orig/src/tabs/tabbablewidget.h
-+++ psi/src/tabs/tabbablewidget.h
-@@ -62,7 +62,8 @@ public:
- 
- 	enum State {
- 		StateNone = 0,
--		StateComposing
-+		StateComposing,
-+		StateHighlighted
- 	};
- 	virtual State state() const = 0;
- 	virtual int unreadMessageCount() const = 0;
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -654,17 +654,25 @@ void TabDlg::updateTab(TabbableWidget* c
- 	tabWidget_->setTabText(chat, captionForTab(chat));
- 	//now set text colour based upon whether there are new messages/composing etc
- 
--	if (chat->state() == TabbableWidget::StateComposing) {
-+	TabbableWidget::State state = chat->state();
-+	if (state == TabbableWidget::StateComposing) {
- 		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.composing-color").value<QColor>());
- 		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/typing")->icon());
- 	}
--	else if (chat->unreadMessageCount()) {
--		tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
--		tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
--	}
- 	else {
--		tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
--		tabWidget_->setTabIcon(chat, chat->icon());
-+		if (state == TabbableWidget::StateHighlighted) {
-+			tabWidget_->setTabTextColor(chat, PsiOptions::instance()->getOption("options.ui.look.colors.chat.unread-message-color").value<QColor>());
-+		}
-+		else {
-+			tabWidget_->setTabTextColor(chat, palette().color(QPalette::Text));
-+		}
-+
-+		if(chat->unreadMessageCount()) {
-+			tabWidget_->setTabIcon(chat, IconsetFactory::iconPtr("psi/chat")->icon());
-+		}
-+		else {
-+			tabWidget_->setTabIcon(chat, chat->icon());
-+		}
- 	}
- 	updateCaption();
- }

psi-plus-main-20160309.tar.xz/patches/0270-psi-set-window-icons.diff Deleted

@@ -1,277 +0,0 @@
---- psi.orig/src/aboutdlg.cpp
-+++ psi/src/aboutdlg.cpp
-@@ -24,12 +24,14 @@
- 
- #include "applicationinfo.h"
- #include "aboutdlg.h"
-+#include "iconset.h"
- 
- AboutDlg::AboutDlg(QWidget* parent)
- 	: QDialog(parent)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/psiplus_logo").icon());
- 
- 	setModal(false);
- 
---- psi.orig/src/accountmanagedlg.cpp
-+++ psi/src/accountmanagedlg.cpp
-@@ -42,6 +42,7 @@
- #include "psicontactlist.h"
- #include "iconaction.h"
- #include "shortcutmanager.h"
-+#include "iconset.h"
- 
- using namespace XMPP;
- 
-@@ -95,6 +96,7 @@ AccountRemoveDlg::AccountRemoveDlg(const
- :QDialog(parent)
- {
- 	setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/account").icon());
- 	setModal(false);
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
- 	d = new Private;
---- psi.orig/src/activitydlg.cpp
-+++ psi/src/activitydlg.cpp
-@@ -33,7 +33,9 @@ ActivityDlg::ActivityDlg(QList<PsiAccoun
- 	if(pa_.isEmpty())
- 		close();
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("activities/other").icon());
- 	setModal(false);
-+
- 	connect(ui_.cb_general_type, SIGNAL(currentIndexChanged(const QString&)), SLOT(loadSpecificActivities(const QString&)));
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
- 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
---- psi.orig/src/avcall/calldlg.cpp
-+++ psi/src/avcall/calldlg.cpp
-@@ -28,6 +28,7 @@
- #include "common.h"
- #include "psiaccount.h"
- #include "psioptions.h"
-+#include "iconset.h"
- 
- // from opt_avcall.cpp
- extern void options_avcall_update();
-@@ -68,6 +69,7 @@ public:
- 	{
- 		ui.setupUi(q);
- 		q->setWindowTitle(tr("Voice Call"));
-+		q->setWindowIcon(IconsetFactory::icon("psi/avcall").icon());
- 
- 		ui.lb_bandwidth->setEnabled(false);
- 		ui.cb_bandwidth->setEnabled(false);
---- psi.orig/src/bookmarkmanagedlg.cpp
-+++ psi/src/bookmarkmanagedlg.cpp
-@@ -39,6 +39,8 @@ BookmarkManageDlg::BookmarkManageDlg(Psi
- 	setAttribute(Qt::WA_DeleteOnClose, true);
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/bookmarks").icon());
-+
- 	account_->dialogRegister(this);
- 
- 	QAction* removeBookmarkAction = new QAction(this);
---- psi.orig/src/contactmanager/contactmanagerdlg.cpp
-+++ psi/src/contactmanager/contactmanagerdlg.cpp
-@@ -44,6 +44,7 @@ ContactManagerDlg::ContactManagerDlg(Psi
- 	ui_.setupUi(this);
- 	pa_->dialogRegister(this);
- 	setWindowTitle(tr("Contacts Manager")+" - "+pa->jid().bare());
-+	setWindowIcon(IconsetFactory::icon("psi/action_contacts_manager").icon());
- 
- 	um = new ContactManagerModel(this, pa_);
- 	um->reloadUsers();
---- psi.orig/src/geolocationdlg.cpp
-+++ psi/src/geolocationdlg.cpp
-@@ -27,6 +27,7 @@
- #include "pepmanager.h"
- #include "geolocation.h"
- #include <QLineEdit>
-+#include "iconset.h"
- 
- GeoLocationDlg::GeoLocationDlg(QList<PsiAccount*> list) : QDialog(0), pa_(list)
- {
-@@ -34,7 +35,9 @@ GeoLocationDlg::GeoLocationDlg(QList<Psi
- 	if(pa_.isEmpty())
- 		close();
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("system/geolocation").icon());
- 	setModal(false);
-+
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
-  	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setGeoLocation()));
- 	connect(ui_.pb_reset, SIGNAL(clicked()), SLOT(reset()));
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -678,7 +678,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, con
- 	setAcceptDrops(true);
- 
- #ifndef Q_OS_MAC
--	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
-+	setWindowIcon(IconsetFactory::icon("psi/start-chat").icon());
- #endif
- 
- 	ui_.setupUi(this);
-@@ -1298,6 +1298,7 @@ void GCMainDlg::doBookmark()
- 	formLayout->addRow(tr("&Auto join:"), cbAutoJoin);
- 	layout->addLayout(formLayout);
- 	layout->addLayout(blayout);
-+	dlg->setWindowIcon(IconsetFactory::icon("psi/bookmark_remove").icon());
- 	dlg->setLayout(layout);
- 	dlg->setMinimumWidth(300);
- 	dlg->connect(saveBtn, SIGNAL(clicked()), dlg, SLOT(accept()));
-@@ -1994,7 +1995,7 @@ void GCMainDlg::setLooks()
- 
- 	// update the widget icon
- #ifndef Q_OS_MAC
--	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
-+	setWindowIcon(IconsetFactory::icon("psi/start-chat").icon());
- #endif
- 
- 	ui_.lv_users->setLooks();
---- psi.orig/src/mooddlg.cpp
-+++ psi/src/mooddlg.cpp
-@@ -34,7 +34,9 @@ MoodDlg::MoodDlg(QList<PsiAccount*> list
- 	if(pa_.isEmpty())
- 		close();
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("mood/").icon());
- 	setModal(false);
-+
- 	connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
- 	connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setMood()));
- 
---- psi.orig/src/mucjoindlg.cpp
-+++ psi/src/mucjoindlg.cpp
-@@ -30,6 +30,7 @@
- #include "psicontactlist.h"
- #include "groupchatdlg.h"
- #include "bookmarkmanager.h"
-+#include "iconset.h"
- 
- static const int nickConflictCode = 409;
- static const QString additionalSymbol = "_";
-@@ -42,6 +43,7 @@ MUCJoinDlg::MUCJoinDlg(PsiCon* psi, PsiA
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
- 	setModal(false);
- 	ui_.setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
- 	controller_ = psi;
- 	account_ = 0;
- 	controller_->dialogRegister(this);
---- psi.orig/src/options/optionsdlg.cpp
-+++ psi/src/options/optionsdlg.cpp
-@@ -509,6 +509,7 @@ OptionsDlg::OptionsDlg(PsiCon *psi, QWid
- 	: QDialog(parent)
- {
- 	setupUi(this);
-+	setWindowIcon(IconsetFactory::icon("psi/options").icon());
- 	pb_apply = buttonBox->button(QDialogButtonBox::Apply);
- 
- 	setAttribute(Qt::WA_DeleteOnClose);
---- psi.orig/src/privacy/privacydlg.cpp
-+++ psi/src/privacy/privacydlg.cpp
-@@ -26,6 +26,7 @@
- #include "privacylist.h"
- #include "privacymanager.h"
- #include "privacylistmodel.h"
-+#include "iconset.h"
- 
- // fixme: subscribe on the destroyed() signal of the manager
- 
-@@ -34,6 +35,7 @@ PrivacyDlg::PrivacyDlg(const QString& ac
- 	ui_.setupUi(this);
- 	setAttribute(Qt::WA_DeleteOnClose);
- 	setWindowTitle(tr("%1: Privacy Lists").arg(account_name));
-+	setWindowIcon(IconsetFactory::icon("psi/eye").icon());
- 	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
- 
- 	connect(manager_,SIGNAL(listsReceived(const QString&, const QString&, const QStringList&)),SLOT(updateLists(const QString&, const QString&, const QStringList&)));
---- psi.orig/src/profiledlg.cpp
-+++ psi/src/profiledlg.cpp
-@@ -81,6 +81,7 @@ ProfileOpenDlg::ProfileOpenDlg(const QSt
- 	setupUi(this);
- 	setModal(true);
- 	setWindowTitle(CAP(windowTitle()));
-+	setWindowIcon(IconsetFactory::icon("psi/profile").icon());

psi-plus-main-20160309.tar.xz/patches/0280-psi-optionseditor-show-only-first-line.diff Deleted

psi-plus-main-20160309.tar.xz/patches/0290-psi-custom-chat-window-caption.diff Deleted

@@ -1,52 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -112,6 +112,7 @@
- 				<auto-popup type="bool">false</auto-popup>
- 				<auto-capitalize type="bool">false</auto-capitalize>
- 				<auto-scroll-to-bottom type="bool">true</auto-scroll-to-bottom>
-+				<caption type="QString"></caption>
- 				<delete-contents-after type="QString">never</delete-contents-after>
- 				<raise-chat-windows-on-new-messages type="bool">false</raise-chat-windows-on-new-messages>
- 				<switch-tab-on-new-messages type="bool">false</switch-tab-on-new-messages>
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -637,7 +637,10 @@ void ChatDlg::setSelfDestruct(int minute
- 
- QString ChatDlg::desiredCaption() const
- {
--	QString cap = "";
-+	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
-+	if(!cap.isEmpty()) {
-+		return cap;
-+	}
- 
- 	if (pending_ > 0) {
- 		cap += "* ";
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -1941,7 +1941,10 @@ void GCMainDlg::doAlert()
- 
- QString GCMainDlg::desiredCaption() const
- {
--	QString cap = "";
-+	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
-+	if(!cap.isEmpty()) {
-+		return cap;
-+	}
- 
- 	if (d->pending > 0) {
- 		cap += "* ";
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -558,7 +558,10 @@ void TabDlg::activated()
- 
- QString TabDlg::desiredCaption() const
- {
--	QString cap = "";
-+	QString cap = PsiOptions::instance()->getOption("options.ui.chat.caption").toString();
-+	if(!cap.isEmpty()) {
-+		return cap;
-+	}
- 	uint pending = 0;
- 	foreach(TabbableWidget* tab, tabs_) {
- 		pending += tab->unreadMessageCount();

psi-plus-main-20160309.tar.xz/patches/0300-psi-fix-trackbar.diff Deleted

@@ -1,107 +0,0 @@
---- psi.orig/src/tabs/tabbablewidget.cpp
-+++ psi/src/tabs/tabbablewidget.cpp
-@@ -37,10 +37,14 @@
- 
- TabbableWidget::TabbableWidget(const Jid &jid, PsiAccount *pa, TabManager *tabManager)
- 	: AdvancedWidget<QWidget>(0)
-+	, state_(Deactivated)
- 	, jid_(jid)
- 	, pa_(pa)
- 	, tabManager_(tabManager)
- {
-+	stateCommitTimer_.setInterval(100);
-+	stateCommitTimer_.setSingleShot(true);
-+	connect(&stateCommitTimer_, SIGNAL(timeout()), SLOT(commitState()));
- 	//QTimer::singleShot(0, this, SLOT(ensureTabbedCorrectly()));
- }
- 
-@@ -205,11 +209,22 @@ void TabbableWidget::changeEvent(QEvent*
- 	    event->type() == QEvent::WindowStateChange)
- 	{
- 		if (isActiveTab()) {
--			activated();
-+			state_ = Activated;
- 		}
- 		else {
--			deactivated();
-+			state_ = Deactivated;
- 		}
-+		stateCommitTimer_.start();
-+	}
-+}
-+
-+void TabbableWidget::commitState()
-+{
-+	if(state_ == Activated) {
-+		activated();
-+	}
-+	else {
-+		deactivated();
- 	}
- }
- 
---- psi.orig/src/tabs/tabbablewidget.h
-+++ psi/src/tabs/tabbablewidget.h
-@@ -22,6 +22,7 @@
- #define TABBABLE_H
- 
- #include <QIcon>
-+#include <QTimer>
- #include "advwidget.h"
- #include "im.h" // ChatState
- 
-@@ -77,19 +78,26 @@ signals:
- 	void vSplitterMoved(int,int);
- 
- public slots:
--	virtual void deactivated();
--	virtual void activated();
- 	void bringToFront(bool raiseWindow = true);
- 	virtual void ensureTabbedCorrectly();
- 	void hideTab();
- 
- protected:
- 	virtual void setJid(const Jid&);
-+	virtual void deactivated();
-+	virtual void activated();
- 
- 	// reimplemented
- 	void changeEvent(QEvent* e);
- 
-+private slots:
-+	void commitState();
-+
- private:
-+	enum ActivationState { Activated, Deactivated };
-+	ActivationState state_;
-+	QTimer stateCommitTimer_;
-+
- 	Jid jid_;
- 	PsiAccount *pa_;
- 	TabManager *tabManager_;
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -397,12 +397,12 @@ void TabDlg::tabSelected(QWidget* _selec
- 	// _selected could be null when TabDlg is closing and deleting all its tabs
- 	TabbableWidget* selected = _selected ? qobject_cast<TabbableWidget*>(_selected) : 0;
- 	if (!selectedTab_.isNull()) {
--		selectedTab_->deactivated();
-+		QCoreApplication::postEvent(selectedTab_, new QEvent(QEvent::ActivationChange));
- 	}
- 
- 	selectedTab_ = selected;
- 	if (selected) {
--		selected->activated();
-+		QCoreApplication::postEvent(selected, new QEvent(QEvent::ActivationChange));
- 	}
- 
- 	updateCaption();
-@@ -520,7 +520,7 @@ void TabDlg::closeTab(TabbableWidget* ch
- 	chat->hide();
- 	removeTabWithNoChecks(chat);
- 	chat->setParent(0);
--	chat->deactivated();
-+	QCoreApplication::postEvent(chat, new QEvent(QEvent::ActivationChange));
- 	if (tabWidget_->count() > 0) {
- 		updateCaption();
- 	}

psi-plus-main-20160309.tar.xz/patches/0310-psi-fix-online-contacts-count-update.diff Deleted

@@ -1,45 +0,0 @@
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -448,6 +448,11 @@ public:
- 		reconnectTimeoutTimer_ = new QTimer(this);
- 		reconnectTimeoutTimer_->setSingleShot(true);
- 		connect(reconnectTimeoutTimer_, SIGNAL(timeout()), SLOT(reconnectTimerTimeout()));
-+
-+		updateOnlineContactsCountTimer_ = new QTimer(this);
-+		updateOnlineContactsCountTimer_->setInterval(500);
-+		updateOnlineContactsCountTimer_->setSingleShot(true);
-+		connect(updateOnlineContactsCountTimer_, SIGNAL(timeout()), SLOT(updateOnlineContactsCountTimeout()));
- 	}
- 
- 	PsiContactList* contactList;
-@@ -475,6 +480,7 @@ public:
- 	bool pepAvailable;
- 	QString currentConnectionError;
- 	int currentConnectionErrorCondition;
-+	QTimer *updateOnlineContactsCountTimer_;
- 
- 	// Tune
- 	Tune lastTune;
-@@ -644,7 +650,8 @@ public:
- 		return pathToProfile(activeProfile, ApplicationInfo::DataLocation) + "/events-" + JIDUtil::encode(acc.id).toLower() + ".xml";
- 	}
- 
--	void updateOnlineContactsCount()
-+private slots:
-+	void updateOnlineContactsCountTimeout()
- 	{
- 		int newOnlineContactsCount = 0;
- 		foreach(const PsiContact* c, contacts) {
-@@ -660,6 +667,12 @@ public:
- 		}
- 	}
- 
-+public:
-+	void updateOnlineContactsCount()
-+	{
-+		updateOnlineContactsCountTimer_->start();
-+	}
-+
- 	// FIXME: Rename updateEntry -> updateContact
- 	void updateEntry(const UserListItem& u)
- 	{

psi-plus-main-20160309.tar.xz/patches/0320-psi-muc-highlight-events.diff Deleted

@@ -1,383 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -328,6 +328,7 @@ QLineEdit#le_status_text {
- 					<height>420</height>
- 				</size>
- 				<use-highlighting type="bool">true</use-highlighting><use-nick-coloring type="bool">true</use-nick-coloring><use-hash-nick-coloring type="bool">true</use-hash-nick-coloring><colored-history type="bool">true</colored-history>
-+				<allow-highlight-events type="bool">false</allow-highlight-events>
- 			</muc>
- 			<show-deprecated comment="Deprecated functionality or protocols">
- 				<service-discovery comment="Service discovery dialog">
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -449,6 +449,8 @@ void ChatDlg::ensureTabbedCorrectly()
- 
- void ChatDlg::updateContact(const Jid &j, bool fromPresence)
- {
-+	if (account()->groupchats().contains(j.full()))
-+		return;
- 	// if groupchat, only update if the resource matches
- 	if (account()->findGCContact(j) && !jid().compare(j)) {
- 		return;
---- psi.orig/src/groupchatdlg.cpp
-+++ psi/src/groupchatdlg.cpp
-@@ -199,6 +199,7 @@ public:
- 		dlg = d;
- 		nickSeparator = ":";
- 		nonAnonymous = false;
-+		alert = false;
- 
- 		trackBar = false;
- 		mCmdManager.registerProvider(this);
-@@ -236,6 +237,7 @@ public:
- 	int pending;
- 	int hPending; // highlight pending
- 	bool connecting;
-+	bool alert;
- 
- 	QStringList hist;
- 	int histAt;
-@@ -1025,6 +1027,7 @@ void GCMainDlg::activated()
- 			u->setPending(d->pending, d->hPending);
- 			account()->updateEntry(*u);
- 		}
-+		messagesRead(jid());
- 		invalidateTab();
- 	}
- 	doFlash(false);
-@@ -1733,11 +1736,11 @@ void GCMainDlg::avatarUpdated(const Jid
- 	}
- }
- 
--void GCMainDlg::message(const Message &_m)
-+void GCMainDlg::message(const Message &_m, const PsiEvent::Ptr &e)
- {
- 	Message m = _m;
- 	QString from = m.from().resource();
--	bool alert = false;
-+	d->alert = false;
- 
- 	if (m.getMUCStatuses().contains(100)) {
- 		d->nonAnonymous = true;
-@@ -1787,7 +1790,7 @@ void GCMainDlg::message(const Message &_
- 
- 	// code to determine if the speaker was addressing this client in chat
- 	if(m.body().contains(d->self))
--		alert = true;
-+		d->alert = true;
- 
- 	if (m.body().left(d->self.length()) == d->self)
- 		d->lastReferrer = m.from().resource();
-@@ -1796,7 +1799,7 @@ void GCMainDlg::message(const Message &_
- 		QStringList highlightWords = options->getOption("options.ui.muc.highlight-words").toStringList();
- 		foreach (QString word, highlightWords) {
- 			if(m.body().contains((word), Qt::CaseInsensitive)) {
--				alert = true;
-+				d->alert = true;
- 			}
- 		}
- 	}
-@@ -1807,13 +1810,12 @@ void GCMainDlg::message(const Message &_
- 			account()->playSound(PsiAccount::eSend);
- 	}
- 	else {
--		if(alert || (options->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) )
-+		if(d->alert || (options->getOption("options.ui.notifications.sounds.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) )
- 			account()->playSound(PsiAccount::eGroupChat);
- 
--		if(alert || (options->getOption("options.ui.notifications.passive-popups.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) ) {
-+		if(d->alert || (options->getOption("options.ui.notifications.passive-popups.notify-every-muc-message").toBool() && !m.spooled() && !from.isEmpty()) ) {
- 			if (!m.spooled() && !isActiveTab() && !m.from().resource().isEmpty()) {
- 				XMPP::Jid jid = m.from()/*.withDomain("")*/;
--				MessageEvent::Ptr e(new MessageEvent(m, account()));
- 				UserListItem i;
- 				i.setPrivate(true);
- 				account()->psi()->popupManager()->doPopup(account(), PopupManager::AlertGcHighlight, jid, m.from().resource(), &i, e);
-@@ -1822,9 +1824,9 @@ void GCMainDlg::message(const Message &_
- 	}
- 
- 	if(from.isEmpty())
--		appendSysMsg(m.body(), alert, m.timeStamp());
-+		appendSysMsg(m.body(), d->alert, m.timeStamp());
- 	else
--		appendMessage(m, alert);
-+		appendMessage(m, d->alert);
- }
- 
- void GCMainDlg::joined()
-@@ -1861,6 +1863,11 @@ const QDateTime & GCMainDlg::lastMsgTime
- 	return d->te_log()->lastMsgTime();
- }
- 
-+bool GCMainDlg::isLastMessageAlert() const
-+{
-+	return d->alert;
-+}
-+
- void GCMainDlg::appendSysMsg(const QString &str, bool alert, const QDateTime &ts)
- {
- 	MessageView mv = MessageView::fromPlainText(str, MessageView::System);
---- psi.orig/src/groupchatdlg.h
-+++ psi/src/groupchatdlg.h
-@@ -31,6 +31,7 @@
- #include "ui_groupchatdlg.h"
- #include "mucmanager.h"
- #include "advwidget.h"
-+#include "psievent.h"
- 
- using namespace XMPP;
- 
-@@ -70,12 +71,13 @@ public:
- 
- 	void error(int, const QString &);
- 	void presence(const QString &, const Status &);
--	void message(const Message &);
-+	void message(const Message &, const PsiEvent::Ptr &e = PsiEvent::Ptr());
- 	void joined();
- 	void setPassword(const QString&);
- 	const QString& nick() const;
- 	const QString& topic() const;
- 	const QDateTime& lastMsgTime() const;
-+	bool isLastMessageAlert() const;
- 
- 	bool isInactive() const;
- 	void reactivate();
-@@ -100,6 +102,7 @@ protected:
- 
- signals:
- 	void aSend(const Message &);
-+	void messagesRead(const Jid &);
- 
- public slots:
- 	// reimplemented
---- psi.orig/src/psiaccount.cpp
-+++ psi/src/psiaccount.cpp
-@@ -2789,9 +2789,9 @@ void PsiAccount::processIncomingMessage(
- 
- #ifdef GROUPCHAT
- 	if(_m.type() == "groupchat") {
--		GCMainDlg *w = findDialog<GCMainDlg*>(Jid(_m.from().bare()));
--		if(w)
--			w->message(_m);
-+		MessageEvent::Ptr me(new MessageEvent(_m, this));
-+		me->setOriginLocal(false);
-+		handleEvent(me, IncomingStanza);
- 		return;
- 	}
- #endif
-@@ -5076,7 +5076,17 @@ void PsiAccount::handleEvent(const PsiEv
- 				!(e->type() == PsiEvent::Message &&
- 				 e.staticCast<MessageEvent>()->message().body().isEmpty()))
- 			{
--				logEvent(e->from(), e);
-+				bool isMuc = false;
-+#ifdef GROUPCHAT
-+				if(e->type() == PsiEvent::Message) {
-+					MessageEvent::Ptr me = e.staticCast<MessageEvent>();
-+					if (me->message().type() == "groupchat")
-+						isMuc = true;
-+				}
-+#endif
-+				if (!isMuc) {
-+					logEvent(e->from(), e);
-+				}
- 			}
- 		}
- 	}
-@@ -5116,7 +5126,7 @@ void PsiAccount::handleEvent(const PsiEv
- 		}
- 
- 		// Pass message events to chat window
--		if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty()) {
-+		if ((m.containsEvents() || m.chatState() != StateNone) && m.body().isEmpty() && m.type() != "groupchat") {
- 			if (o->getOption("options.messages.send-composing-events").toBool()) {
- 				ChatDlg *c = findChatDialogEx(e->from());
- 				if (c) {
-@@ -5180,6 +5190,22 @@ void PsiAccount::handleEvent(const PsiEv
- 			doPopup = true;
- 			popupType = PopupManager::AlertHeadline;
- 		} // /headline

psi-plus-main-20160309.tar.xz/patches/0330-iris-XEP-0083-nested-roster-groups.diff Deleted

@@ -1,479 +0,0 @@
---- psi.orig/iris/src/xmpp/xmpp-im/client.cpp
-+++ psi/iris/src/xmpp/xmpp-im/client.cpp
-@@ -102,6 +102,8 @@ using namespace Jabber;*/
- #define vsnprintf _vsnprintf
- #endif
- 
-+#define GROUPS_DELIMITER_TIMEOUT 10
-+
- namespace XMPP
- {
- 
-@@ -887,12 +889,38 @@ void Client::prRoster(const Roster &r)
- 	importRoster(r);
- }
- 
--void Client::rosterRequest()
-+void Client::rosterRequest(bool withGroupsDelimiter)
- {
- 	if(!d->active)
- 		return;
- 
- 	JT_Roster *r = new JT_Roster(rootTask());
-+	int timeout = 0;
-+	if (withGroupsDelimiter) {
-+		connect(r, SIGNAL(finished()), SLOT(slotRosterDelimiterRequestFinished()));
-+		r->getGroupsDelimiter();
-+		// WORKAROUND: Some bad servers (Facebook for example) don't response
-+		// on groups delimiter request. Wait timeout and go ahead.
-+		r->setTimeout(GROUPS_DELIMITER_TIMEOUT);
-+	}
-+	else {
-+		connect(r, SIGNAL(finished()), SLOT(slotRosterRequestFinished()));
-+		r->get();
-+		d->roster.flagAllForDelete(); // mod_groups patch
-+	}
-+
-+	r->go(true);
-+}
-+
-+void Client::slotRosterDelimiterRequestFinished()
-+{
-+	JT_Roster *r = qobject_cast<JT_Roster*>(sender());
-+	if(r->success()) {
-+		d->roster.setGroupsDelimiter(r->groupsDelimiter());
-+		emit rosterGroupsDelimiterRequestFinished(r->groupsDelimiter());
-+	}
-+
-+	r = new JT_Roster(rootTask());
- 	connect(r, SIGNAL(finished()), SLOT(slotRosterRequestFinished()));
- 	r->get();
- 	d->roster.flagAllForDelete(); // mod_groups patch
-@@ -1256,13 +1284,35 @@ void LiveRosterItem::setFlagForDelete(bo
- //---------------------------------------------------------------------------
- // LiveRoster
- //---------------------------------------------------------------------------
-+class LiveRoster::Private
-+{
-+public:
-+	QString groupsDelimiter;
-+};
-+
- LiveRoster::LiveRoster()
--:QList<LiveRosterItem>()
-+	: QList<LiveRosterItem>()
-+	, d(new LiveRoster::Private)
- {
- }
- 
- LiveRoster::~LiveRoster()
- {
-+	delete d;
-+}
-+
-+LiveRoster::LiveRoster(const LiveRoster &other)
-+	: QList<LiveRosterItem>(other)
-+	, d(new LiveRoster::Private)
-+{
-+	d->groupsDelimiter = other.d->groupsDelimiter;
-+}
-+
-+LiveRoster &LiveRoster::operator=(const LiveRoster &other)
-+{
-+	QList<LiveRosterItem>::operator=(other);
-+	d->groupsDelimiter = other.d->groupsDelimiter;
-+	return *this;
- }
- 
- void LiveRoster::flagAllForDelete()
-@@ -1291,4 +1341,14 @@ LiveRoster::ConstIterator LiveRoster::fi
- 	return it;
- }
- 
-+void LiveRoster::setGroupsDelimiter(const QString &groupsDelimiter)
-+{
-+	d->groupsDelimiter = groupsDelimiter;
-+}
-+
-+QString LiveRoster::groupsDelimiter() const
-+{
-+	return d->groupsDelimiter;
-+}
-+
- }
---- psi.orig/iris/src/xmpp/xmpp-im/types.cpp
-+++ psi/iris/src/xmpp/xmpp-im/types.cpp
-@@ -2846,13 +2846,35 @@ bool RosterItem::fromXml(const QDomEleme
- //---------------------------------------------------------------------------
- // Roster
- //---------------------------------------------------------------------------
-+class Roster::Private
-+{
-+public:
-+	QString groupsDelimiter;
-+};
-+
- Roster::Roster()
--:QList<RosterItem>()
-+	: QList<RosterItem>()
-+	, d(new Roster::Private)
- {
- }
- 
- Roster::~Roster()
- {
-+	delete d;
-+}
-+
-+Roster::Roster(const Roster &other)
-+	: QList<RosterItem>(other)
-+	, d(new Roster::Private)
-+{
-+	d->groupsDelimiter = other.d->groupsDelimiter;
-+}
-+
-+Roster &Roster::operator=(const Roster &other)
-+{
-+	QList<RosterItem>::operator=(other);
-+	d->groupsDelimiter = other.d->groupsDelimiter;
-+	return *this;
- }
- 
- Roster::Iterator Roster::find(const Jid &j)
-@@ -2875,6 +2897,16 @@ Roster::ConstIterator Roster::find(const
- 	return end();
- }
- 
-+void Roster::setGroupsDelimiter(const QString &groupsDelimiter)
-+{
-+	d->groupsDelimiter = groupsDelimiter;
-+}
-+
-+QString Roster::groupsDelimiter() const
-+{
-+	return d->groupsDelimiter;
-+}
-+
- 
- //---------------------------------------------------------------------------
- // FormField
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_client.h
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_client.h
-@@ -79,7 +79,7 @@ namespace XMPP
- 		QString resource() const;
- 		Jid jid() const;
- 
--		void rosterRequest();
-+		void rosterRequest(bool withGroupsDelimiter = true);
- 		void sendMessage(const Message &, bool want_notify = false);
- 		void sendSubscription(const Jid &, const QString &, const QString& nick = QString());
- 		void setPresence(const Status &);
-@@ -138,6 +138,7 @@ namespace XMPP
- 		void activated();
- 		void disconnected();
- 		//void authFinished(bool, int, const QString &);
-+		void rosterGroupsDelimiterRequestFinished(const QString &);
- 		void rosterRequestFinished(bool, int, const QString &);
- 		void rosterItemAdded(const RosterItem &);
- 		void rosterItemUpdated(const RosterItem &);
-@@ -171,6 +172,7 @@ namespace XMPP
- 		void streamIncomingXml(const QString &);
- 		void streamOutgoingXml(const QString &);
- 
-+		void slotRosterDelimiterRequestFinished();
- 		void slotRosterRequestFinished();
- 
- 		// basic daemons
---- psi.orig/iris/src/xmpp/xmpp-im/xmpp_liveroster.h
-+++ psi/iris/src/xmpp/xmpp-im/xmpp_liveroster.h
-@@ -34,9 +34,19 @@ namespace XMPP
- 		LiveRoster();
- 		~LiveRoster();
- 
-+		LiveRoster(const LiveRoster &other);
-+		LiveRoster &operator=(const LiveRoster &other);
-+
- 		void flagAllForDelete();
- 		LiveRoster::Iterator find(const Jid &, bool compareRes=true);
- 		LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const;
-+

psi-plus-main-20160309.tar.xz/patches/0340-psi-multirows-tab.diff Deleted

@@ -1,920 +0,0 @@
---- psi.orig/options/default.xml
-+++ psi/options/default.xml
-@@ -510,6 +510,7 @@ QLineEdit#le_status_text {
- 				<tab-singles type="QString" comment="Tab types that would have been untabbed are given their own tabset. 'C' for chat and 'M' for mucs"/>
- 				<use-tab-shortcuts type="bool">true</use-tab-shortcuts>
- 				<show-tab-buttons type="bool">true</show-tab-buttons>
-+				<multi-rows comment="Use multi rows mode for chat tab bar" type="bool">true</multi-rows>
- 			</tabs>
- 		</ui>
- 		<shortcuts comment="Shortcuts">
---- psi.orig/src/widgets/psitabbar.cpp
-+++ psi/src/widgets/psitabbar.cpp
-@@ -32,7 +32,7 @@
-  * Constructor
-  */
- PsiTabBar::PsiTabBar(PsiTabWidget *parent)
--		: QTabBar(parent)
-+		: TabBar(parent)
- 		, dragsEnabled_(true) {
- 	//setAcceptDrops(true);
- 
-@@ -79,7 +79,7 @@ int PsiTabBar::findTabUnder(const QPoint
- }
- 
- void PsiTabBar::mousePressEvent(QMouseEvent *event) {
--	QTabBar::mousePressEvent(event);
-+	TabBar::mousePressEvent(event);
- 	event->accept();
- }
- 
-@@ -145,7 +145,7 @@ void PsiTabBar::setDragsEnabled(bool ena
- 
- void PsiTabBar::paintEvent(QPaintEvent *event)
- {
--	QTabBar::paintEvent(event);
-+	TabBar::paintEvent(event);
- };
- 
- void PsiTabBar::resizeEvent(QResizeEvent * event)
---- psi.orig/src/widgets/psitabbar.h
-+++ psi/src/widgets/psitabbar.h
-@@ -21,12 +21,12 @@
- #ifndef _PSITABBAR_H_
- #define _PSITABBAR_H_
- 
--#include <QTabBar>
-+#include "tabbar.h"
- #include <QPoint>
- 
- class PsiTabWidget;
- 
--class PsiTabBar : public QTabBar
-+class PsiTabBar : public TabBar
- {
- 	Q_OBJECT
- 
---- psi.orig/src/widgets/psitabwidget.cpp
-+++ psi/src/widgets/psitabwidget.cpp
-@@ -38,7 +38,10 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
- 		: QWidget(parent) {
- 	tabsPosition_ = QTabWidget::East; // impossible => uninitialised state
- 	tabBar_ = new PsiTabBar(this);
--	tabBar_->setUsesScrollButtons(true);
-+
-+	bool multiRow = PsiOptions::instance()->getOption("options.ui.tabs.multi-rows", true).toBool();
-+	tabBar_->setMultiRow(multiRow);
-+	tabBar_->setUsesScrollButtons(!multiRow);
- 	layout_ = new QVBoxLayout(this);
- 	layout_->setMargin(0);
- 	layout_->setSpacing(0);
-@@ -55,19 +58,21 @@ PsiTabWidget::PsiTabWidget(QWidget *pare
- 	downButton_ = new QToolButton(this);
- 	downButton_->setMinimumSize(3,3);
- 	downButton_->setFixedWidth(buttonwidth);
--	downButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
-+	downButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- 	menu_ = new QMenu(this);
- 	downButton_->setMenu(menu_);
- 	downButton_->setStyleSheet(" QToolButton::menu-indicator { image:none } ");
- 	connect(menu_, SIGNAL(aboutToShow()), SLOT(menu_aboutToShow()));
- 	connect(menu_, SIGNAL(triggered(QAction*)), SLOT(menu_triggered(QAction*)));
- 	barLayout_->addWidget(downButton_);
-+	barLayout_->setAlignment(downButton_, Qt::AlignBottom);
- 
- 	closeButton_ = new QToolButton(this);
- 	closeButton_->setMinimumSize(3,3);
- 	closeButton_->setFixedWidth(buttonwidth);
--	closeButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
-+	closeButton_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- 	barLayout_->addWidget(closeButton_);
-+	barLayout_->setAlignment(closeButton_, Qt::AlignBottom);
- 	closeButton_->setText("x");
- 	downButton_->setArrowType(Qt::DownArrow);
- 	downButton_->setPopupMode(QToolButton::InstantPopup);
-@@ -180,6 +185,7 @@ void PsiTabWidget::addTab(QWidget *widge
- 		tabBar_->addTab(name);
- 	setLooks();
- 	showPage(currentPage());
-+	tabBar_->layoutTabs();
- }
- 
- void PsiTabWidget::setLooks()
-@@ -190,6 +196,14 @@ void PsiTabWidget::setLooks()
- 	}
- }
- 
-+void PsiTabWidget::resizeEvent(QResizeEvent *event)
-+{
-+	QWidget::resizeEvent(event);
-+	if (tabBar_->multiRow()) {
-+		tabBar_->layoutTabs();
-+	}
-+}
-+
- /**
-  * Selects the page for the specified widget.
-  */
---- psi.orig/src/widgets/psitabwidget.h
-+++ psi/src/widgets/psitabwidget.h
-@@ -22,7 +22,6 @@
- #define PSITABWIDGET_H
- 
- #include <QTabWidget>
--#include <QTabBar>
- #include <QDragEnterEvent>
- #include "psitabbar.h"
- 
-@@ -80,6 +79,9 @@ signals:
- 	// context menu on the blank space will have tab==-1
- 	void tabContextMenu(int tab, QPoint pos, QContextMenuEvent *event);
- 
-+protected:
-+	void resizeEvent(QResizeEvent *event);
-+
- private slots:
- 	void mouseDoubleClickTab(int tab);
- 	void mouseMiddleClickTab(int tab);
-@@ -91,7 +93,7 @@ private slots:
- 
- private:
- 	QVector<QWidget*> widgets_;
--	QTabBar *tabBar_;
-+	PsiTabBar *tabBar_;
- 	QVBoxLayout *layout_;
- 	QHBoxLayout *barLayout_;
- 	QStackedLayout *stacked_;
---- /dev/null
-+++ psi/src/widgets/tabbar.cpp
-@@ -0,0 +1,683 @@
-+/*
-+ * tabbar.cpp
-+ * Copyright (C) 2013-2014  Ivan Romanov <drizt@land.ru>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library 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
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "tabbar.h"
-+
-+#include <QAbstractButton>
-+#include <QPixmap>
-+#include <QStyleOptionTab>
-+#include <QStylePainter>
-+#include <QMouseEvent>
-+
-+class CloseButton : public QAbstractButton
-+{
-+	Q_OBJECT
-+
-+public:
-+	CloseButton(QWidget *parent = 0);
-+
-+	QSize sizeHint() const;
-+	inline QSize minimumSizeHint() const
-+		{ return sizeHint(); }
-+	void enterEvent(QEvent *event);
-+	void leaveEvent(QEvent *event);
-+	void paintEvent(QPaintEvent *event);
-+};
-+
-+class TabBar::Private
-+{
-+public:
-+	TabBar *q;
-+	Private(TabBar *base)
-+	{
-+		q = base;

psi-plus-main-20160309.tar.xz/patches/8000-psi-extend-plugins-interface.diff Deleted

@@ -1,4778 +0,0 @@
---- a/iris/src/xmpp/xmpp-im/client.cpp
-+++ b/iris/src/xmpp/xmpp-im/client.cpp
-@@ -619,6 +619,7 @@ void Client::send(const QDomElement &x, bool want_notify)
- 		//printf("bad stanza??\n");
- 		return;
- 	}
-+	emit stanzaElementOutgoing(e);
- 	QString out = s.toString();
- 	//qWarning() << "Out: " << out;
- 	debug(QString("Client: outgoing: [\n%1]\n").arg(out));
---- a/iris/src/xmpp/xmpp-im/xmpp_client.h
-+++ b/iris/src/xmpp/xmpp-im/xmpp_client.h
-@@ -148,6 +148,7 @@ namespace XMPP
- 		void debugText(const QString &);
- 		void xmlIncoming(const QString &);
- 		void xmlOutgoing(const QString &);
-+		void stanzaElementOutgoing(QDomElement &);
- 		void groupChatJoined(const Jid &);
- 		void groupChatLeft(const Jid &);
- 		void groupChatPresence(const Jid &, const Status &);
---- a/src/applicationinfo.cpp
-+++ b/src/applicationinfo.cpp
-@@ -27,6 +27,7 @@
- 
- #include "psiapplication.h"
- #include "applicationinfo.h"
-+#include "systeminfo.h"
- #include "profiles.h"
- #include "homedirmigration.h"
- #include "activeprofiles.h"
-@@ -82,6 +83,11 @@ QString ApplicationInfo::capsNode()
- 	return PROG_CAPS_NODE;
- }
- 
-+QString ApplicationInfo::osName()
-+{
-+	return SystemInfo::instance()->os();
-+}
-+
- QString ApplicationInfo::IPCName()
- {
- 	return PROG_IPC_NAME;
---- a/src/applicationinfo.h
-+++ b/src/applicationinfo.h
-@@ -19,6 +19,7 @@ public:
- 	static QLatin1String sname();
- 	static QString version();
- 	static QString capsNode();
-+	static QString osName();
- 	static QString IPCName();
- 
- 	// URLs
---- a/src/chatdlg.cpp
-+++ b/src/chatdlg.cpp
-@@ -80,6 +80,10 @@
- #include <windows.h>
- #endif
- 
-+#ifdef PSI_PLUGINS
-+#include "pluginmanager.h"
-+#endif
-+
- #include "psichatdlg.h"
- 
- static const QString geometryOption = "options.ui.chat.size";
-@@ -893,10 +897,26 @@ void ChatDlg::appendMessage(const Message &m, bool local)
- 	}
- 
- 	MessageView mv(MessageView::Message);
--	if (m.containsHTML() && PsiOptions::instance()->getOption("options.html.chat.render").toBool() && !m.html().body().firstChild().isNull()) {
--		mv.setHtml(m.html().toString("span"));
-+
-+	QString body = m.body();
-+	HTMLElement htmlElem;
-+	if (m.containsHTML())
-+		htmlElem = m.html();
-+
-+#ifdef PSI_PLUGINS
-+	QDomElement html = htmlElem.body();
-+
-+	PluginManager::instance()->appendingChatMessage(account(), jid().full(), body, html, local);
-+
-+	if(!html.isNull())
-+		htmlElem.setBody(html);
-+#endif
-+
-+	if (PsiOptions::instance()->getOption("options.html.chat.render").toBool() && !htmlElem.body().isNull()
-+			&& !htmlElem.body().firstChild().isNull()) {
-+		mv.setHtml(htmlElem.toString("span"));
- 	} else {
--		mv.setPlainText(m.body());
-+		mv.setPlainText(body);
- 	}
- 	mv.setMessageId(m.id());
- 	mv.setLocal(local);
---- a/src/chatdlg.h
-+++ b/src/chatdlg.h
-@@ -170,7 +170,11 @@ protected:
- 
- 	void appendMessage(const Message &, bool local = false);
- 	virtual bool isEncryptionEnabled() const;
-+
-+public:
- 	virtual void appendSysMsg(const QString& txt) = 0;
-+
-+protected:
- 	virtual void nicksChanged();
- 
- 	QString whoNick(bool local) const;
---- a/src/common.cpp
-+++ b/src/common.cpp
-@@ -64,6 +64,7 @@
- #include "applicationinfo.h"
- #include "psioptions.h"
- #include "activity.h"
-+#include "tabdlg.h"
- 
- Qt::WindowFlags psi_dialog_flags = (Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
- 
-@@ -428,6 +429,32 @@ void reorderGridLayout(QGridLayout* layout, int maxCols)
- 	}
- }
- 
-+TabbableWidget* findActiveTab()
-+{
-+	QWidget* chat = QApplication::activeWindow();
-+	TabbableWidget* tw = 0;
-+	if(chat) {
-+		TabDlg* td = qobject_cast<TabDlg*>(chat);
-+		if(td) {
-+			tw = td->getCurrentTab();
-+		}
-+		else {
-+			tw = qobject_cast<TabbableWidget*>(chat);
-+			if (!tw) {
-+				QList<TabDlg*> tmp = chat->findChildren<TabDlg*>(); // all-in-one
-+				while(!tmp.isEmpty()) {
-+					TabDlg* td = tmp.takeFirst();
-+					tw = td->getCurrentTab();
-+					if(tw) {
-+						break;
-+					}
-+				}
-+			}
-+		}
-+	}
-+	return tw;
-+}
-+
- #ifdef HAVE_X11
- #include <X11/Xlib.h>
- #include <X11/Xutil.h> // needed for WM_CLASS hinting
---- a/src/common.h
-+++ b/src/common.h
-@@ -30,6 +30,7 @@
- #include <QGridLayout>
- 
- class QMenu;
-+class TabbableWidget;
- 
- #include "statuspreset.h"
- 
-@@ -150,6 +151,7 @@ void clearMenu(QMenu *m); // deletes all items, including submenus, from given Q
- void bringToFront(QWidget *w, bool grabFocus = true);
- void replaceWidget(QWidget *, QWidget *);
- void closeDialogs(QWidget *);
-+TabbableWidget* findActiveTab();
- #ifdef HAVE_X11
- #include <QWidget>
- #include <QX11Info>
---- a/src/contactlistaccountmenu.cpp
-+++ b/src/contactlistaccountmenu.cpp
-@@ -22,6 +22,8 @@
- 
- #include <QPointer>
- 
-+#include "pluginmanager.h"
-+#include "psiiconset.h"
- #include "psiaccount.h"
- #include "contactlistaccountgroup.h"
- #include "accountstatusmenu.h"
-@@ -64,6 +66,7 @@ class ContactListAccountMenu::Private : public QObject
- 	QAction* adminUpdateMotdAction_;
- 	QAction* adminDeleteMotdAction_;
- 	QAction *doGroupChatAction_;
-+	QMenu* pluginsMenu_;
- 
- public:
- 	Private(ContactListAccountMenu* menu, ContactListAccountGroup* _account)
-@@ -166,6 +169,12 @@ public:
- 		menu->addAction(xmlConsoleAction_);
- 		menu->addSeparator();
- 		menu->addAction(modifyAccountAction_);
-+
-+#ifdef PSI_PLUGINS
-+		pluginsMenu_ = menu->addMenu(IconsetFactory::icon("psi/plugins").icon(), tr("Plugins"));
-+		PluginManager::instance()->addAccountMenu(pluginsMenu_, account->account());
-+#endif
-+

psi-plus-main-20160309.tar.xz/patches/9970-psiplus-join-to-support-muc.diff Deleted

@@ -1,46 +0,0 @@
-Entering 'iris'
-Entering 'src/libpsi'
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -1096,7 +1096,7 @@ void MainWin::actOnlineHomeActivated ()
- 
- void MainWin::actOnlineForumActivated ()
- {
--	DesktopUtil::openUrl("http://forum.psi-im.org");
-+	DesktopUtil::openUrl("http://forum.psi-plus.com");
- }
- 
- void MainWin::actJoinPsiMUCActivated()
-@@ -1106,12 +1106,12 @@ void MainWin::actJoinPsiMUCActivated()
- 		return;
- 	}
- 
--	account->actionJoin("psi@conference.psi-im.org");
-+	account->actionJoin("psi-dev@conference.jabber.ru");
- }
- 
- void MainWin::actBugReportActivated ()
- {
--	DesktopUtil::openUrl("http://forum.psi-im.org/forum/2");
-+	DesktopUtil::openUrl("http://code.google.com/p/psi-dev/wiki/issues?tm=3");
- }
- 
- void MainWin::actAboutActivated ()
---- psi.orig/src/psiactionlist.cpp
-+++ psi/src/psiactionlist.cpp
-@@ -386,11 +386,11 @@ void PsiActionList::Private::createMainW
- 		IconAction *actOnlineHome = new IconAction (tr("Home Page (Online)"), tr("&Home Page (Online)"), 0, this);
- 		actOnlineHome->setWhatsThis (tr("Home Page (Online)"));
- 
--		IconAction *actOnlineForum = new IconAction (tr("Psi Forum (Online)"), tr("Psi &Forum (Online)"), 0, this);
--		actOnlineForum->setWhatsThis (tr("Psi Forum (Online)"));
-+		IconAction *actOnlineForum = new IconAction (tr("Psi+ Forum (Online)"), tr("Psi+ &Forum (Online)"), 0, this);
-+		actOnlineForum->setWhatsThis (tr("Psi+ Forum (Online)"));
- 
--		IconAction *actPsiMUC = new IconAction (tr("Join Psi Discussion Room (Online)"), tr("&Join Psi Discussion Room (Online)"), 0, this);
--		actOnlineHome->setWhatsThis (tr("Join Psi Discussion Room (Online)"));
-+		IconAction *actPsiMUC = new IconAction (tr("Join Psi+ Discussion Room (Online)"), tr("&Join Psi+ Discussion Room (Online)"), 0, this);
-+		actOnlineHome->setWhatsThis (tr("Join Psi+ Discussion Room (Online)"));
- 
- 		IconAction *actBugReport = new IconAction (tr("Report a Bug (Online)"), tr("Report a &Bug (Online)"), 0, this);
- 		actBugReport->setWhatsThis (tr("Report a Bug (Online)"));

psi-plus-main-20160309.tar.xz/patches/9980-psi-search-for-psimedia-in-all-plugins-dirs.diff Deleted

@@ -1,62 +0,0 @@
---- psi.orig/src/applicationinfo.cpp
-+++ psi/src/applicationinfo.cpp
-@@ -134,6 +134,17 @@ QStringList ApplicationInfo::dataDirs()
- 	return  dirs;
- }
- 
-+QStringList ApplicationInfo::pluginDirs()
-+{
-+	QStringList l;
-+	l += resourcesDir() + "/plugins";
-+	l += homeDir(ApplicationInfo::DataLocation) + "/plugins";
-+#if defined(Q_OS_UNIX)
-+	l += libDir() + "/plugins";
-+#endif
-+	return l;
-+}
-+
- QString ApplicationInfo::getCertificateStoreSaveDir()
- {
- 	QDir certsave(homeDir(DataLocation) + "/certs");
---- psi.orig/src/applicationinfo.h
-+++ psi/src/applicationinfo.h
-@@ -40,6 +40,7 @@ public:
- 	static QStringList getCertificateStoreDirs();
- 	static QString getCertificateStoreSaveDir();
- 	static QStringList dataDirs();
-+	static QStringList pluginDirs();
- 
- 	// Namespaces
- 	static QString optionsNS();
---- psi.orig/src/avcall/avcall.cpp
-+++ psi/src/avcall/avcall.cpp
-@@ -117,7 +117,11 @@ static void ensureLoaded()
- 			pluginFile = findPlugin("../Plugins", "gstprovider");
- 			resourcePath = QCoreApplication::applicationDirPath() + "/../Frameworks/gstreamer-0.10";
- #else
--			pluginFile = findPlugin(ApplicationInfo::libDir() + "/plugins", "gstprovider");
-+			foreach(const QString& path, ApplicationInfo::pluginDirs()) {
-+				pluginFile = findPlugin(path, "gstprovider");
-+				if(!pluginFile.isEmpty())
-+					break;
-+			}
- #endif
- 		}
- 
---- psi.orig/src/pluginmanager.cpp
-+++ psi/src/pluginmanager.cpp
-@@ -60,13 +60,7 @@ public:
-  */
- static QStringList pluginDirs()
- {
--	QStringList l;
--	l += ApplicationInfo::resourcesDir() + "/plugins";
--	l += ApplicationInfo::homeDir(ApplicationInfo::DataLocation) + "/plugins";
--#if defined(Q_OS_UNIX)
--	l += ApplicationInfo::libDir() + "/plugins";
--#endif
--	return l;
-+	return ApplicationInfo::pluginDirs();
- }
- 
- /**

psi-plus-main-20160309.tar.xz/patches/9990-psiplus-aboutdlg.diff Deleted

@@ -1,115 +0,0 @@
---- psi.orig/src/aboutdlg.cpp
-+++ psi/src/aboutdlg.cpp
-@@ -71,6 +71,52 @@ AboutDlg::AboutDlg(QWidget* parent)
- 			   tr("Developer"));
- 	ui_.te_authors->setText( authors );
- 
-+	// fill in About Psi+ tab...
-+	QString psiplus;
-+	psiplus += details(QString::fromUtf8("Psi+ Project"),
-+			   "", "psi-dev@conference.jabber.ru", "http://psi-dev.googlecode.com/",
-+			   tr("Active project members are presents below:"));
-+	psiplus += details(QString::fromUtf8("zet"),
-+			   "vladimir.shelukhin@gmail.com", "", "",
-+			   tr("Founder, Patcher and MS Windows Packager"));
-+	psiplus += details(QString::fromUtf8("rion"),
-+			   "rion4ik@gmail.com", "", "",
-+			   tr("Founder and Lead Patcher"));
-+	psiplus += details(QString::fromUtf8("majik"),
-+			   "maksim.maj@gmail.com", "", "",
-+			   tr("Founder, Designer and Patcher"));
-+	psiplus += details(QString::fromUtf8("Dealer_WeARE"),
-+			   "wadealer@gmail.com", "", "",
-+			   tr("Lead Patcher and Plugins Writer; Mac OS X Packager"));
-+	psiplus += details(QString::fromUtf8("liuch"),
-+			   "", "", "",
-+			   tr("Patcher and Plugins Writer"));
-+	psiplus += details(QString::fromUtf8("tehnick"),
-+			  "tehnick-8@mail.ru", "", "",
-+			  tr("Language coordinator; Debian Packager"));
-+	psiplus += details(QString::fromUtf8("KukuRuzo"),
-+			   "", "", "",
-+			   tr("Patcher and Plugins Writer"));
-+	psiplus += details(QString::fromUtf8("taurus"),
-+			   "", "", "",
-+			   tr("Patcher, Plugins Writer and Fedora Packager"));
-+	psiplus += details(QString::fromUtf8("ivan1986"),
-+			   "", "", "",
-+			   tr("Patcher and Ubuntu Packager"));
-+	psiplus += details(QString::fromUtf8("nexor (aka zerkalica)"),
-+			   "", "", "",
-+			   tr("Ubuntu Packager"));
-+	psiplus += details(QString::fromUtf8("Flint (aka Флинт)"),
-+			   "", "", "",
-+			   tr("Mandriva Linux Packager"));
-+	psiplus += details(QString::fromUtf8("ivan101"),
-+			   "ivan101@users.sourceforge.net", "", "",
-+			   tr("Patcher and Russian localization"));
-+	psiplus += details(QString::fromUtf8("Z_God"),
-+			   "", "", "",
-+			   tr("Psimedia Patcher and Wiki English localization"));
-+	ui_.te_psiplus->setText( psiplus );
-+
- 	// fill in Thanks To tab...
- 	QString thanks;
- 	thanks += details(QString::fromUtf8("Frederik Schwarzer"),
-@@ -182,7 +228,7 @@ QString AboutDlg::details( QString name,
- 	if ( !email.isEmpty() )
- 		ret += nbsp + "E-mail: " + "<a href=\"mailto:" + email + "\">" + email + "</a><br>\n";
- 	if ( !jabber.isEmpty() )
--		ret += nbsp + "XMPP: " + "<a href=\"xmpp:" + jabber + "\">" + jabber + "</a><br>\n";
-+		ret += nbsp + "XMPP: " + "<a href=\"xmpp:" + jabber + "?join\">" + jabber + "</a><br>\n";
- 	if ( !www.isEmpty() )
- 		ret += nbsp + "WWW: " + "<a href=\"" + www + "\">" + www + "</a><br>\n";
- 	if ( !desc.isEmpty() )
---- psi.orig/src/about.ui
-+++ psi/src/about.ui
-@@ -8,12 +8,12 @@
-    <rect>
-     <x>0</x>
-     <y>0</y>
--    <width>504</width>
-+    <width>625</width>
-     <height>320</height>
-    </rect>
-   </property>
-   <property name="windowTitle" >
--   <string>About Psi</string>
-+   <string>About</string>
-   </property>
-   <layout class="QVBoxLayout" >
-    <property name="margin" >
-@@ -39,7 +39,7 @@
-         <enum>QFrame::Plain</enum>
-        </property>
-        <property name="psiIconName" stdset="0" >
--        <string>psi/logo_48</string>
-+        <string>psi/psiplus_logo</string>
-        </property>
-       </widget>
-      </item>
-@@ -221,7 +221,23 @@ Copyright © 2001-2014 The Psi Team.&lt;
-        </item>
-       </layout>
-      </widget>
--    </widget>
-+     <widget class="QWidget" name="tab_psiplus" >
-+      <attribute name="title" >
-+       <string>About Psi+</string>
-+      </attribute>
-+      <layout class="QVBoxLayout" >
-+       <property name="margin" >
-+        <number>9</number>
-+       </property>
-+       <property name="spacing" >
-+        <number>6</number>
-+       </property>
-+       <item>
-+        <widget class="PsiTextView" name="te_psiplus" />
-+       </item>
-+      </layout>
-+     </widget>
-+	 </widget>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" >

psi-plus-main-20160309.tar.xz/patches/9998-psi-plus-migrate-old-home.diff Deleted

psi-plus-main-20160309.tar.xz/patches/9999-psiplus-application-info.diff Deleted

@@ -1,136 +0,0 @@
---- a/certs/README
-+++ b/certs/README
-@@ -4,7 +4,7 @@ Please use PSIDATADIR/certs for local additions.
- 
- Default value of PSIDATADIR:
-   Linux, MacOS X and other Unices
--     ~/.psi/ 
-+     ~/.local/share/psi+/
-   Windows NT, 2000, XP and Server 2003
-      %UserProfile%\PsiData\ (usually C:\Documents and Settings\username\PsiData )
-   Windows 95, 98 and Me
---- a/psi.desktop
-+++ b/psi.desktop
-@@ -5,11 +5,11 @@ Type=Application
- Name=Psi+
- GenericName=XMPP Client
- Comment=Communicate over the XMPP network
--Icon=psi
--Exec=psi %U
-+Icon=psi-plus
-+Exec=psi-plus %U
- MimeType=x-scheme-handler/xmpp;
- Terminal=false
--StartupWMClass=Psi
-+StartupWMClass=Psi-plus
- Categories=Network;InstantMessaging;Qt;
- Keywords=XMPP;Jabber;Chat;InstantMessaging;
- 
---- a/qcm/conf.qcm
-+++ b/qcm/conf.qcm
-@@ -81,8 +81,8 @@ public:
- 		psiGenerateFile(sourceDir + "/.qmake.cache.in", ".qmake.cache", vars);
- 
- #ifndef Q_OS_WIN
--		conf->addExtra(QString("PSI_LIBDIR=%1/psi").arg(conf->getenv("LIBDIR")));
--		conf->addExtra(QString("PSI_DATADIR=%1/psi").arg(conf->getenv("DATADIR")));
-+		conf->addExtra(QString("PSI_LIBDIR=%1/psi-plus").arg(conf->getenv("LIBDIR")));
-+		conf->addExtra(QString("PSI_DATADIR=%1/psi-plus").arg(conf->getenv("DATADIR")));
- #endif
- 
- 		QDir(".").mkdir("src");
-@@ -90,8 +90,8 @@ public:
- 		if ( file.open(QIODevice::WriteOnly | QIODevice::Text) ) {
- 			QTextStream stream( &file );
- #ifndef Q_OS_WIN
--			stream << "#define PSI_LIBDIR \"" << conf->getenv("LIBDIR") << "/psi\"" << endl;
--			stream << "#define PSI_DATADIR \"" << conf->getenv("DATADIR") << "/psi\"" << endl;
-+			stream << "#define PSI_LIBDIR \"" << conf->getenv("LIBDIR") << "/psi-plus\"" << endl;
-+			stream << "#define PSI_DATADIR \"" << conf->getenv("DATADIR") << "/psi-plus\"" << endl;
- #endif
- 			stream << "#define PSI_VERSION \"" << version << "\"" << endl;
- 		}
---- a/src/applicationinfo.cpp
-+++ b/src/applicationinfo.cpp
-@@ -42,12 +42,12 @@
- //
- // PROG_SNAME - read as small name, system name, soname, short name, fs name
- 
--#define PROG_NAME "Psi"
--#define PROG_SNAME "psi"
-+#define PROG_NAME "Psi+"
-+#define PROG_SNAME "psi+"
- #define PROG_VERSION PSI_VERSION
- //#define PROG_VERSION "0.15-dev" " (" __DATE__ ")" //CVS Builds are dated
- //#define PROG_VERSION "0.15";
--#define PROG_CAPS_NODE "http://psi-im.org"
-+#define PROG_CAPS_NODE "http://psi-dev.googlecode.com/caps"
- #define PROG_IPC_NAME "org.psi-im.Psi"	// must not contain '\\' character on Windows
- #define PROG_OPTIONS_NS "http://psi-im.org/options"
- #define PROG_STORAGE_NS "http://psi-im.org/storage"
---- a/src/homedirmigration.ui
-+++ b/src/homedirmigration.ui
-@@ -43,7 +43,7 @@ p, li { white-space: pre-wrap; }
- &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
- p, li { white-space: pre-wrap; }
- &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Serif'; font-size:12pt; font-weight:400; font-style:normal;&quot;&gt;
--&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;Copy the existing profile to the new directory required to run Psi. The old profile will not be removed. You can remove it manually later.&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:medium; font-weight:600; color:#1a1a1a;&quot;&gt;(Recommended)&lt;/span&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;Copy the existing profile to the new directory required to run Psi+. The old profile will not be removed. You can remove it manually later.&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:medium; font-weight:600; color:#1a1a1a;&quot;&gt;(Recommended)&lt;/span&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-      <property name="text">
-       <string>Import Psi profile</string>
-@@ -74,7 +74,7 @@ p, li { white-space: pre-wrap; }
- &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
- p, li { white-space: pre-wrap; }
- &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Serif'; font-size:12pt; font-weight:400; font-style:normal;&quot;&gt;
--&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;Create a new Psi profile. The old profile will not be removed, but you will be unable to choose it.&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:medium; font-weight:600; color:#1a1a1a;&quot;&gt;(Not recommended)&lt;/span&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;Create a new Psi+ profile. The old profile will not be removed, but you will be unable to choose it.&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:medium; font-weight:600; color:#1a1a1a;&quot;&gt;(Not recommended)&lt;/span&gt;&lt;span style=&quot; font-size:medium; color:#1a1a1a;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-      <property name="text">
-       <string>Create new profile</string>
---- a/src/plugins/psiplugin.pri
-+++ b/src/plugins/psiplugin.pri
-@@ -14,7 +14,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
-   DEFINES += HAVE_QT5
- }
- 
--target.path = $$(HOME)/.local/share/Psi/plugins
-+target.path = $$(HOME)/.local/share/psi+/plugins
- INSTALLS += target
- 
- include(plugins.pri)
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -4,7 +4,7 @@
- 
- # Configuration
- TEMPLATE = app
--TARGET   = psi
-+TARGET   = psi-plus
- CONFIG  += qt thread x11
- DESTDIR  = $$top_builddir
- 
-@@ -43,17 +43,17 @@ unix {
- 
- 	# icons and desktop files
- 	dt.path=$$PREFIX/share/applications/
--	dt.files = ../psi.desktop
-+	dt.extra = cp -f ../psi.desktop $(INSTALL_ROOT)$$dt.path/psi-plus.desktop
- 	icon1.path=$$PREFIX/share/icons/hicolor/16x16/apps
--	icon1.extra = cp -f ../iconsets/system/default/psiplus/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi.png
-+	icon1.extra = cp -f ../iconsets/system/default/psiplus/logo_16.png $(INSTALL_ROOT)$$icon1.path/psi-plus.png
- 	icon2.path=$$PREFIX/share/icons/hicolor/32x32/apps
--	icon2.extra = cp -f ../iconsets/system/default/psiplus/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi.png
-+	icon2.extra = cp -f ../iconsets/system/default/psiplus/logo_32.png $(INSTALL_ROOT)$$icon2.path/psi-plus.png
- 	icon3.path=$$PREFIX/share/icons/hicolor/48x48/apps
--	icon3.extra = cp -f ../iconsets/system/default/psiplus/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi.png
-+	icon3.extra = cp -f ../iconsets/system/default/psiplus/logo_48.png $(INSTALL_ROOT)$$icon3.path/psi-plus.png
- 	icon4.path=$$PREFIX/share/icons/hicolor/64x64/apps
--	icon4.extra = cp -f ../iconsets/system/default/psiplus/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi.png
-+	icon4.extra = cp -f ../iconsets/system/default/psiplus/logo_64.png $(INSTALL_ROOT)$$icon4.path/psi-plus.png
- 	icon5.path=$$PREFIX/share/icons/hicolor/128x128/apps
--	icon5.extra = cp -f ../iconsets/system/default/psiplus/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi.png
-+	icon5.extra = cp -f ../iconsets/system/default/psiplus/logo_128.png $(INSTALL_ROOT)$$icon5.path/psi-plus.png
- 	INSTALLS += dt icon1 icon2 icon3 icon4 icon5
- }
-

psi-plus-main-20160309.tar.xz/patches/dev Deleted

psi-plus-main-20160309.tar.xz/patches/dev/0460-psi-plugins-fixes.patch Deleted

@@ -1,182 +0,0 @@
---- git.temp.orig/src/plugins/generic/antievil/antievil.cpp
-+++ git.temp/src/plugins/generic/antievil/antievil.cpp
-@@ -42,7 +42,7 @@ public:
- 		return "0.1";
- 	}
- 
--	virtual QWidget* options() const
-+	virtual QWidget* options()
- 	{
- 		return 0;
- 	}
-@@ -92,6 +92,13 @@ public:
- 		return blocked;
- 	}
- 
-+	virtual bool incomingStanza(int account, QDomElement& stanza)
-+	{
-+		Q_UNUSED(account)
-+		Q_UNUSED(stanza)
-+		return false;
-+	}
-+
- 
- 	//-- StanzaSender ----------------------------------------
- 
-@@ -100,6 +107,9 @@ public:
- 		stanzaSender = host;
- 	}
- 
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
-+
- 
- private:
- 	StanzaSendingHost* stanzaSender;
---- git.temp.orig/src/plugins/generic/consoledump/consoledumpplugin.cpp
-+++ git.temp/src/plugins/generic/consoledump/consoledumpplugin.cpp
-@@ -39,9 +39,11 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- 
-     virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject) ;
-@@ -72,7 +74,7 @@ QString ConsoleDumpPlugin::version() con
- 	return "0.1";
- }
- 
--QWidget* ConsoleDumpPlugin::options() const
-+QWidget* ConsoleDumpPlugin::options()
- {
- 	return 0;
- }
---- git.temp.orig/src/plugins/generic/echo/echoplugin.cpp
-+++ git.temp/src/plugins/generic/echo/echoplugin.cpp
-@@ -44,12 +44,12 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
- 
- 	// EventFilter
--    virtual bool processEvent(int account, const QDomElement& e);
-+	virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject);
- 
- 	// StanzaSender
-@@ -59,7 +59,8 @@ public:
- 	virtual void setOptionAccessingHost(OptionAccessingHost* host);
- 	virtual void optionChanged(const QString& option);
- 
--
-+	virtual void applyOptions();
-+	virtual void restoreOptions();
- 
- private:
- 	bool enabled;
-@@ -91,7 +92,7 @@ QString EchoPlugin::version() const
- 	return "0.1";
- }
- 
--QWidget* EchoPlugin::options() const
-+QWidget* EchoPlugin::options()
- {
- 	return 0;
- }
-@@ -160,6 +161,4 @@ void EchoPlugin::optionChanged(const QSt
- {
- 	Q_UNUSED(option);
- }
--
--
- #include "echoplugin.moc"
---- git.temp.orig/src/plugins/generic/noughtsandcrosses/noughtsandcrossesplugin.cpp
-+++ git.temp/src/plugins/generic/noughtsandcrosses/noughtsandcrossesplugin.cpp
-@@ -44,7 +44,7 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
- 
-@@ -52,6 +52,8 @@ public:
- 
-     virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject);
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- 
- private slots:
- 	void stopGame();
-@@ -95,7 +97,7 @@ QString NoughtsAndCrossesPlugin::version
- 	return "0.1";
- }
- 
--QWidget* NoughtsAndCrossesPlugin::options() const
-+QWidget* NoughtsAndCrossesPlugin::options()
- {
- 	return 0;
- }
---- git.temp.orig/src/plugins/generic/null/nullplugin.cpp
-+++ git.temp/src/plugins/generic/null/nullplugin.cpp
-@@ -34,9 +34,11 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- };
- 
- Q_EXPORT_PLUGIN(NullPlugin);
-@@ -56,7 +58,7 @@ QString NullPlugin::version() const
- 	return "0.1";
- }
- 
--QWidget* NullPlugin::options() const
-+QWidget* NullPlugin::options()
- {
- 	return 0;
- }
---- git.temp.orig/src/plugins/generic/urlwatcher/urlwatcherplugin.cpp
-+++ git.temp/src/plugins/generic/urlwatcher/urlwatcherplugin.cpp
-@@ -44,12 +44,14 @@ public:
- 	virtual QString name() const;
- 	virtual QString shortName() const;
- 	virtual QString version() const;
--	virtual QWidget* options() const;
-+	virtual QWidget* options();
- 	virtual bool enable();
- 	virtual bool disable();
- 
-     virtual bool processEvent(int account, const QDomElement& e);
- 	virtual bool processMessage(int account, const QString& fromJid, const QString& body, const QString& subject) ;
-+	virtual void applyOptions() {};
-+	virtual void restoreOptions() {};
- 
- private:
- 	bool enabled_;
-@@ -107,7 +109,7 @@ QString URLWatcherPlugin::version() cons
- 	return "0.2";
- }
- 
--QWidget* URLWatcherPlugin::options() const
-+QWidget* URLWatcherPlugin::options()
- {
- 	return 0;
- }

psi-plus-main-20160309.tar.xz/patches/dev/fix_historydb_qt5.diff Deleted

@@ -1,70 +0,0 @@
---- git.orig/qcm/qjson.qcm
-+++ git/qcm/qjson.qcm
-@@ -104,6 +104,7 @@ public:
- 	QString shortname() const { return "qjson"; }
- 	bool exec()
- 	{
-+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- 		// get the build mode
- #ifdef QC_BUILDMODE
- 		bool release = qc_buildmode_release;
-@@ -158,5 +159,8 @@ public:
- 		}
- 
- 		return false;
-+#else
-+		return true;
-+#endif
- 	}
- };
---- git.orig/src/eventdb.cpp
-+++ git/src/eventdb.cpp
-@@ -30,9 +30,14 @@
- #include <QDateTime>
- #include <QSqlError>
- #include <QSqlDriver>
-+#ifndef HAVE_QT5
- #include <qjson/parser.h>
- #include "qjson/serializer.h"
--
-+#else
-+#include <QJsonArray>
-+#include <QJsonDocument>
-+#include <QJsonObject>
-+#endif
- #include "common.h"
- #include "applicationinfo.h"
- #include "psievent.h"
-@@ -1388,8 +1393,14 @@ bool EDBSqLite::appendEvent(const QStrin
- 					urlList.append(QVariant(urlItem));
- 				}
- 			xepList["jabber:x:oob"] = QVariant(urlList);
-+#ifndef HAVE_QT5
- 			QJson::Serializer serializer;
- 			extraData = QString::fromUtf8(serializer.serialize(xepList));
-+#else
-+			QJsonDocument doc(QJsonObject::fromVariantMap(xepList));
-+			extraData = QString::fromUtf8(doc.toBinaryData());
-+#endif
-+
- 		}
- 		query->bindValue(":extra_data", extraData);
- 	}
-@@ -1430,9 +1441,17 @@ PsiEvent::Ptr EDBSqLite::getEvent(const
- 		m.setSpooled(true);
- 		QString extraStr = record.value("extra_data").toString();
- 		if (!extraStr.isEmpty()) {
-+#ifndef HAVE_QT5
- 			QJson::Parser parser;
-+#endif
- 			bool fOk;
-+#ifndef HAVE_QT5
- 			QVariantMap extraData = parser.parse(extraStr.toUtf8(), &fOk).toMap();
-+#else
-+			QJsonDocument doc = QJsonDocument::fromJson(extraStr.toUtf8());
-+			fOk = !doc.isNull();
-+			QVariantMap extraData = doc.object().toVariantMap();
-+#endif
- 			if (fOk) {
- 				foreach (const QVariant &urlItem, extraData["jabber:x:oob"].toList()) {
- 					QVariantList itemList = urlItem.toList();

psi-plus-main-20160309.tar.xz/patches/dev/iris_jingle.patch Deleted

@@ -1,1516 +0,0 @@
-diff --git a/include/iris/jingle.h b/include/iris/jingle.h
-new file mode 100644
-index 0000000..7355178
---- /dev/null
-+++ b/include/iris/jingle.h
-@@ -0,0 +1 @@
-+#include "../../src/xmpp/xmpp-im/jingle.h"
-diff --git a/src/xmpp/jid/jid.cpp b/src/xmpp/jid/jid.cpp
-index d1d33be..9fd001d 100644
---- a/src/xmpp/jid/jid.cpp
-+++ b/src/xmpp/jid/jid.cpp
-@@ -18,7 +18,6 @@
-  *
-  */
- 
--//#undef IRIS_XMPP_JID_DEPRECATED
- #include "xmpp/jid/jid.h"
- 
- #include <QCoreApplication>
-diff --git a/src/xmpp/jid/jid.h b/src/xmpp/jid/jid.h
-index 591cca2..fba722d 100644
---- a/src/xmpp/jid/jid.h
-+++ b/src/xmpp/jid/jid.h
-@@ -23,12 +23,6 @@
- 
- #include <QString>
- 
--#ifdef IRIS_XMPP_JID_DEPRECATED
--#define IRIS_XMPP_JID_DECL_DEPRECATED Q_DECL_DEPRECATED
--#else
--#define IRIS_XMPP_JID_DECL_DEPRECATED
--#endif
--
- namespace XMPP 
- {
- 	class Jid
-diff --git a/src/xmpp/xmpp-core/protocol.cpp b/src/xmpp/xmpp-core/protocol.cpp
-index fe51eb7..7a66aff 100644
---- a/src/xmpp/xmpp-core/protocol.cpp
-+++ b/src/xmpp/xmpp-core/protocol.cpp
-@@ -57,18 +57,6 @@ static QString printArray(const QByteArray &a)
- 	return s;
- }
- 
--// firstChildElement
--//
--// Get an element's first child element
--static QDomElement firstChildElement(const QDomElement &e)
--{
--	for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling()) {
--		if(n.isElement())
--			return n.toElement();
--	}
--	return QDomElement();
--}
--
- //----------------------------------------------------------------------------
- // Version
- //----------------------------------------------------------------------------
-@@ -298,7 +286,7 @@ void BasicProtocol::extractStreamError(const QDomElement &e)
- 	QString text;
- 	QDomElement appSpec;
- 
--	QDomElement t = firstChildElement(e);
-+	QDomElement t = e.firstChildElement();
- 	if(t.isNull() || t.namespaceURI() != NS_STREAMS) {
- 		// probably old-style error
- 		errCond = -1;
-@@ -1453,7 +1441,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
- 				return true;
- 			}
- 			else if(e.tagName() == "failure") {
--				QDomElement t = firstChildElement(e);
-+				QDomElement t = e.firstChildElement();
- 				if(t.isNull() || t.namespaceURI() != NS_SASL)
- 					errCond = -1;
- 				else
-diff --git a/src/xmpp/xmpp-core/xmpp_stanza.cpp b/src/xmpp/xmpp-core/xmpp_stanza.cpp
-index 99b4c01..2dba0a6 100644
---- a/src/xmpp/xmpp-core/xmpp_stanza.cpp
-+++ b/src/xmpp/xmpp-core/xmpp_stanza.cpp
-@@ -53,6 +53,8 @@ using namespace XMPP;
- 	both type/condition and code.
- 	Error text in output XML is always presented in XMPP-style only.
- 
-+	WARNING: XEP-0086 is DEPRECATED. but this class is still very handy.
-+
- 	All functions will always try to guess missing information based on mappings defined in the JEP.
- */
- 
-@@ -319,23 +321,21 @@ bool Stanza::Error::fromXml(const QDomElement &e, const QString &baseNS)
- 	type = Private::stringToErrorType(e.attribute("type"));
- 
- 	// condition
--	QDomNodeList nl = e.childNodes();
- 	QDomElement t;
- 	condition = -1;
--	int n;
--	for(n = 0; n < nl.count(); ++n) {
--		QDomNode i = nl.item(n);
--		t = i.toElement();
--		if(!t.isNull()) {
--			// FIX-ME: this shouldn't be needed
--			if(t.namespaceURI() == NS_STANZAS || t.attribute("xmlns") == NS_STANZAS) {
--				condition = Private::stringToErrorCond(t.tagName());
--				if (condition != -1)
--					break;
--			}
-+	for (t = e.firstChildElement(); !t.isNull(); t = t.nextSiblingElement()) {
-+		// FIX-ME: this shouldn't be needed
-+		if(t.namespaceURI() == NS_STANZAS || t.attribute("xmlns") == NS_STANZAS) {
-+			condition = Private::stringToErrorCond(t.tagName());
-+			if (condition != -1)
-+				if (condition == Redirect) {
-+					text = t.text().trimmed();
-+				}
-+				break;
- 		}
- 	}
- 
-+
- 	// code
- 	originalCode = e.attribute("code").toInt();
- 
-@@ -352,19 +352,19 @@ bool Stanza::Error::fromXml(const QDomElement &e, const QString &baseNS)
- 	}
- 
- 	// text
--	t = e.elementsByTagNameNS(NS_STANZAS, "text").item(0).toElement();
--	if(!t.isNull())
--		text = t.text().trimmed();
--	else
--		text = e.text().trimmed();
-+	if (condition != Redirect) {
-+		t = e.elementsByTagNameNS(NS_STANZAS, "text").item(0).toElement();
-+		if(!t.isNull())
-+			text = t.text().trimmed();
-+		else
-+			text = e.text().trimmed();
-+	}
- 
- 	// appspec: find first non-standard namespaced element
- 	appSpec = QDomElement();
--	nl = e.childNodes();
--	for(n = 0; n < nl.count(); ++n) {
--		QDomNode i = nl.item(n);
--		if(i.isElement() && i.namespaceURI() != NS_STANZAS) {
--			appSpec = i.toElement();
-+	for (t = e.firstChildElement(); !t.isNull(); t = t.nextSiblingElement()) {
-+		if(t.namespaceURI() != NS_STANZAS) {
-+			appSpec = t;
- 			break;
- 		}
- 	}
-@@ -396,6 +396,9 @@ QDomElement Stanza::Error::toXml(QDomDocument &doc, const QString &baseNS) const
- 	errElem.setAttribute("type", stype);
- 	errElem.appendChild(t = doc.createElementNS(NS_STANZAS, scond));
- 	t.setAttribute("xmlns", NS_STANZAS);	// FIX-ME: this shouldn't be needed
-+	if (condition == Redirect) {
-+		t.appendChild(doc.createTextNode(text));
-+	}
- 
- 	// old code
- 	int scode = code();
-@@ -403,7 +406,7 @@ QDomElement Stanza::Error::toXml(QDomDocument &doc, const QString &baseNS) const
- 		errElem.setAttribute("code", scode);
- 
- 	// text
--	if(!text.isEmpty()) {
-+	if(!text.isEmpty() && condition != Redirect) {
- 		t = doc.createElementNS(NS_STANZAS, "text");
- 		t.setAttribute("xmlns", NS_STANZAS);	// FIX-ME: this shouldn't be needed
- 		t.appendChild(doc.createTextNode(text));
-diff --git a/src/xmpp/xmpp-im/client.cpp b/src/xmpp/xmpp-im/client.cpp
-index aa077a4..ba88e2d 100644
---- a/src/xmpp/xmpp-im/client.cpp
-+++ b/src/xmpp/xmpp-im/client.cpp
-@@ -70,14 +70,14 @@
- //!  \endcode
- 
- #include <stdarg.h>
--#include <qobject.h>
-+#include <QObject>
- #include <QMap>
--#include <qtimer.h>
--#include <qpointer.h>
--//Added by qt3to4:
-+#include <QTimer>
-+#include <QPointer>
- #include <QList>
- #include "xmpp_tasks.h"
- #include "xmpp_xmlcommon.h"
-+#include "jingle.h"
- #include "s5b.h"
- #include "xmpp_ibb.h"
- #include "xmpp_bitsofbinary.h"
-@@ -139,6 +139,7 @@ public:
- 
- 	LiveRoster roster;

psi-plus-main-20160309.tar.xz/patches/dev/psi-fix-muc-contacts-bank.diff Deleted

@@ -1,635 +0,0 @@
---- git.temp.orig/iris/src/xmpp/xmpp-im/client.cpp
-+++ git.temp/iris/src/xmpp/xmpp-im/client.cpp
-@@ -407,6 +407,26 @@ QString Client::groupChatNick(const QStr
- 	return QString();
- }
- 
-+bool Client::groupchatExist(const Jid &j) const
-+{
-+	if (j.resource().isEmpty()) {
-+		foreach (const GroupChat &gc, d->groupChatList) {
-+			if (gc.j.compare(j, false))
-+				return true;
-+		}
-+	}
-+	return false;
-+}
-+
-+QStringList Client::groupchats() const
-+{
-+	QStringList lst;
-+	foreach (const GroupChat &gc, d->groupChatList)
-+		//if (gc.status == GroupChat::Connected)
-+			lst.append(gc.j.bare());
-+	return lst;
-+}
-+
- /*void Client::start()
- {
- 	if(d->stream->old()) {
---- git.temp.orig/iris/src/xmpp/xmpp-im/xmpp_client.h
-+++ git.temp/iris/src/xmpp/xmpp-im/xmpp_client.h
-@@ -132,6 +132,8 @@ namespace XMPP
- 		void groupChatLeave(const QString &host, const QString &room, const QString &statusStr = QString());
- 		void groupChatLeaveAll(const QString &statusStr = QString());
- 		QString groupChatNick(const QString &host, const QString &room) const;
-+		bool groupchatExist(const Jid &j) const;
-+		QStringList groupchats() const;
- 
- 	signals:
- 		void activated();
---- git.temp.orig/src/chatdlg.cpp
-+++ git.temp/src/chatdlg.cpp
-@@ -115,6 +115,9 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
- 		}
- 	}
- 
-+	if (account()->isGCContact(jid))
-+		account()->gcContactIncRef(jid);
-+
- 	// Message events
- 	contactChatState_ = XMPP::StateNone;
- 	lastChatState_ = XMPP::StateNone;
-@@ -164,6 +167,8 @@ void ChatDlg::init()
- 
- ChatDlg::~ChatDlg()
- {
-+	if (account()->isGCContact(jid()))
-+		account()->gcContactDecRef(jid());
- 	account()->dialogUnregister(this);
- }
- 
-@@ -442,12 +447,11 @@ void ChatDlg::ensureTabbedCorrectly()
- 
- void ChatDlg::updateContact(const Jid &j, bool fromPresence)
- {
--	if (account()->groupchats().contains(j.full()))
-+	if (account()->client()->groupchatExist(j))
- 		return;
- 	// if groupchat, only update if the resource matches
--	if (account()->findGCContact(j) && !jid().compare(j)) {
-+	if (account()->isGCContact(j) && !jid().compare(j))
- 		return;
--	}
- 
- 	if (jid().compare(j, false)) {
- 		QList<UserListItem*> ul = account()->findRelevant(j);
---- git.temp.orig/src/infodlg.cpp
-+++ git.temp/src/infodlg.cpp
-@@ -223,8 +223,7 @@ InfoDlg::InfoDlg(int type, const Jid &j,
- 	}
- 
- 	// fake UserListItem used when displaying groupchat contact
--	GCContact *gcc = pa->findGCContact(j);
--	if (gcc) {
-+	if (pa->isGCContact(j)) {
- 		d->userListItem = new UserListItem(false);
- 		d->userListItem->setJid(j);
- 		d->userListItem->setName(j.resource());
---- git.temp.orig/src/mucmanager.cpp
-+++ git.temp/src/mucmanager.cpp
-@@ -614,3 +614,98 @@ void MUCManager::destroy_finished()
- 		emit destroy_error(t->statusCode(), t->statusString());
- 	}
- }
-+
-+// -----------------------------------------------------------------------------
-+
-+MUCContactList::MUCContactList()
-+{
-+}
-+
-+MUCContactList::~MUCContactList()
-+{
-+	qDeleteAll(mclist);
-+}
-+
-+bool MUCContactList::contains(const Jid &j) const
-+{
-+	if (j.resource().isEmpty())
-+		return false;
-+	return mclist.contains(j.full());
-+}
-+
-+void MUCContactList::mucLeave(const Jid &j)
-+{
-+	QStringList keys_ = mclist.keys();
-+	foreach (const QString &s, keys_) {
-+		const Jid cj = Jid(s);
-+		if (j.isEmpty() || j.compare(cj, false)) {
-+			Status s = status(cj);
-+			s.setType(Status::Offline);
-+			setStatus(cj, s);
-+		}
-+	}
-+}
-+
-+void MUCContactList::incRef(const Jid &j)
-+{
-+	if (j.resource().isEmpty())
-+		return;
-+
-+	MUCContact *mc = mclist.value(j.full());
-+	if (!mc) {
-+		mc = new MUCContact;
-+		mc->refcount = 1;
-+		mc->status = Status();
-+		mclist[j.full()] = mc;
-+	}
-+	else
-+		++mc->refcount;
-+}
-+
-+void MUCContactList::decRef(const Jid &j)
-+{
-+	if (j.resource().isEmpty())
-+		return;
-+
-+	MUCContact *mc = mclist.value(j.full());
-+	if (mc && --mc->refcount == 0) {
-+			mclist.remove(j.full());
-+			delete mc;
-+	}
-+}
-+
-+Status MUCContactList::status(const Jid &j) const
-+{
-+	MUCContact *mc = mclist.value(j.full());
-+	if (mc)
-+		return mc->status;
-+	return Status();
-+}
-+
-+void MUCContactList::setStatus(const Jid &j, Status s)
-+{
-+	MUCContact *mc = mclist.value(j.full());
-+	if (mc) {
-+		bool turn = (s.isAvailable() != mc->status.isAvailable());
-+		mc->status = s;
-+		if (turn) {
-+			if (s.isAvailable())
-+				incRef(j);
-+			else
-+				decRef(j);
-+		}
-+	}
-+	else if (s.isAvailable()) {
-+		incRef(j);
-+		mclist.value(j.full())->status = s;
-+	}
-+}
-+
-+QList<Jid> MUCContactList::jids() const
-+{
-+	QList<Jid> jl;
-+	foreach (const QString &s, mclist.keys()) {
-+		jl.append(Jid(s));
-+	}
-+	return jl;
-+}
---- git.temp.orig/src/mucmanager.h
-+++ git.temp/src/mucmanager.h
-@@ -25,6 +25,7 @@
- 
- #include "xmpp_muc.h"
- #include "xmpp_jid.h"
-+#include "xmpp_status.h"
- 
- class QString;
- namespace XMPP {

psi-plus-main-20160309.tar.xz/patches/dev/psi-fix-win32-Qt5.patch Deleted

psi-plus-main-20160309.tar.xz/patches/dev/psi-nested-groups.diff Deleted

@@ -1,1767 +0,0 @@
---- git.temp.orig/options/default.xml
-+++ git.temp/options/default.xml
-@@ -275,6 +275,7 @@ QLineEdit#le_status_text {
- 						<margin type="int">0</margin>
- 					</avatar>
- 				</roster-avatar-frame>
-+				<default-groups-delimiter comment="Default nested groups delimiter will be used if no delimiter on the server" type="QString">::</default-groups-delimiter>
- 			</contactlist>
- 			<menu comment="Options for the menu">
- 				<account comment="Options for the account-specific menu">
---- git.temp.orig/src/accountmodify.ui
-+++ git.temp/src/accountmodify.ui
-@@ -7,7 +7,7 @@
-     <x>0</x>
-     <y>0</y>
-     <width>765</width>
--    <height>475</height>
-+    <height>522</height>
-    </rect>
-   </property>
-   <property name="windowTitle">
-@@ -1043,6 +1043,63 @@ When you enable this option you will not
-         </widget>
-        </item>
-        <item>
-+        <layout class="QHBoxLayout" name="horizontalLayout_2">
-+         <item>
-+          <widget class="QLabel" name="label_3">
-+           <property name="text">
-+            <string>Nested groups delimiter: </string>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <widget class="QLineEdit" name="le_groupsdelimiter">
-+           <property name="sizePolicy">
-+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-+             <horstretch>0</horstretch>
-+             <verstretch>0</verstretch>
-+            </sizepolicy>
-+           </property>
-+           <property name="maximumSize">
-+            <size>
-+             <width>64</width>
-+             <height>16777215</height>
-+            </size>
-+           </property>
-+           <property name="readOnly">
-+            <bool>true</bool>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <spacer name="horizontalSpacer">
-+           <property name="orientation">
-+            <enum>Qt::Horizontal</enum>
-+           </property>
-+           <property name="sizeHint" stdset="0">
-+            <size>
-+             <width>40</width>
-+             <height>20</height>
-+            </size>
-+           </property>
-+          </spacer>
-+         </item>
-+         <item>
-+          <widget class="QPushButton" name="pb_groupsdelimiter">
-+           <property name="text">
-+            <string>Change...</string>
-+           </property>
-+          </widget>
-+         </item>
-+         <item>
-+          <widget class="QPushButton" name="pb_disablegroupsdelimiter">
-+           <property name="text">
-+            <string>Disable</string>
-+           </property>
-+          </widget>
-+         </item>
-+        </layout>
-+       </item>
-+       <item>
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-@@ -1123,8 +1180,8 @@ When you enable this option you will not
-    <slot>reject()</slot>
-    <hints>
-     <hint type="sourcelabel">
--     <x>346</x>
--     <y>439</y>
-+     <x>355</x>
-+     <y>512</y>
-     </hint>
-     <hint type="destinationlabel">
-      <x>523</x>
---- git.temp.orig/src/accountmodifydlg.cpp
-+++ git.temp/src/accountmodifydlg.cpp
-@@ -35,6 +35,7 @@
- #include "psicontactlist.h"
- #include "iconaction.h"
- #include "actionlineedit.h"
-+#include "userlist.h"
- 
- AccountModifyDlg::AccountModifyDlg(PsiCon *_psi, QWidget *parent)
- :QDialog(parent)
-@@ -223,6 +224,12 @@ void AccountModifyDlg::init()
- 	pb_removeBlock->hide();
- 	pb_addBlock->hide();
- 
-+	// Misc
-+	connect(pb_groupsdelimiter, SIGNAL(clicked()), SLOT(miscChangeGroupsDelimiter()));
-+	connect(pb_disablegroupsdelimiter, SIGNAL(clicked()), SLOT(miscDisableGroupsDelimiter()));
-+	if (pa && pa->userList())
-+		le_groupsdelimiter->setText(pa->userList()->groupsDelimiter());
-+
- 	// QWhatsThis helpers
- 	cb_plain->setWhatsThis(
- 		tr("Normally, Psi logs in using the <i>digest</i> authentication "
-@@ -504,6 +511,22 @@ void AccountModifyDlg::removeStunHost()
- 	cb_stunHost->setCurrentIndex(0);
- }
- 
-+void AccountModifyDlg::miscChangeGroupsDelimiter()
-+{
-+	if (pa) {
-+		pa->changeGroupsDelimiter();
-+		le_groupsdelimiter->setText(pa->userList()->groupsDelimiter());
-+	}
-+}
-+
-+void AccountModifyDlg::miscDisableGroupsDelimiter()
-+{
-+	if (pa) {
-+		pa->disableGroupsDelimiter();
-+		le_groupsdelimiter->setText(pa->userList()->groupsDelimiter());
-+	}
-+}
-+
- void AccountModifyDlg::save()
- {
- 	/*if(pa && le_name->text().isEmpty()) {
---- git.temp.orig/src/accountmodifydlg.h
-+++ git.temp/src/accountmodifydlg.h
-@@ -57,6 +57,8 @@ private slots:
- 	void detailsChangePW();
- 
- 	void removeStunHost();
-+	void miscChangeGroupsDelimiter();
-+	void miscDisableGroupsDelimiter();
- 
- 	void save();
- 
---- git.temp.orig/src/contactlistaccountgroup.cpp
-+++ git.temp/src/contactlistaccountgroup.cpp
-@@ -30,14 +30,13 @@
- #include "contactlistgroupcache.h"
- 
- ContactListAccountGroup::ContactListAccountGroup(ContactListModel* model, ContactListGroup* parent, PsiAccount* account)
--	: ContactListNestedGroup(model, parent, QString())
-+	: ContactListNestedGroup(model, parent, account, QString())
- 	, isRoot_(!account)
--	, account_(account)
- {
--	if (account_) {
-+	if (account) {
- 		model->groupCache()->addGroup(this);
--		connect(account_, SIGNAL(destroyed(QObject*)), SLOT(accountUpdated()));
--		connect(account_, SIGNAL(updatedAccount()), SLOT(accountUpdated()));
-+		connect(account, SIGNAL(destroyed(QObject*)), SLOT(accountUpdated()));
-+		connect(account, SIGNAL(updatedAccount()), SLOT(accountUpdated()));
- 	}
- }
- 
-@@ -57,11 +56,6 @@ void ContactListAccountGroup::clearGroup
- 	ContactListNestedGroup::clearGroup();
- }
- 
--PsiAccount* ContactListAccountGroup::account() const
--{
--	return account_;
--}
--
- ContactListModel::Type ContactListAccountGroup::type() const
- {
- 	return ContactListModel::AccountType;
-@@ -140,7 +134,7 @@ void ContactListAccountGroup::accountUpd
- 
- 	model()->updatedItem(root->findGroup(this));
- 
--	if (account_.isNull() || !account_->enabled()) {
-+	if (!account() || !account()->enabled()) {
- 		clearGroup();
- 		root->removeAccount(this);
- 	}
-@@ -148,8 +142,8 @@ void ContactListAccountGroup::accountUpd
- 
- const QString& ContactListAccountGroup::displayName() const
- {

psi-plus-main-20160309.tar.xz/patches/dev/psi-new-history.patch Deleted

@@ -1,4442 +0,0 @@
---- git.orig/admin/build/build_package.sh
-+++ git/admin/build/build_package.sh
-@@ -82,10 +82,13 @@ build_package_psi() {
- 		cp $mqtdir/bin/QtNetwork4.dll $arch_prefix
- 		cp $mqtdir/bin/QtXml4.dll $arch_prefix
- 		cp $mqtdir/bin/QtGui4.dll $arch_prefix
-+		cp $mqtdir/bin/QtSql4.dll $arch_prefix
- 		mkdir -p $arch_prefix/imageformats
- 		cp $mqtdir/plugins/imageformats/qgif4.dll $arch_prefix/imageformats
- 		cp $mqtdir/plugins/imageformats/qjpeg4.dll $arch_prefix/imageformats
- 		cp $mqtdir/plugins/imageformats/qmng4.dll $arch_prefix/imageformats
-+		mkdir -p $arch_prefix/sqldrivers
-+		cp $mqtdir/plugins/sqldrivers/qsqlite4.dll
- 		cp $deps_base/$qca_win_dir/$target_arch/bin/qca2.dll $arch_prefix
- 		mkdir -p $arch_prefix/crypto
- 		cp $deps_base/$qca_win_dir/$target_arch/plugins/crypto/qca-gnupg2.dll $arch_prefix/crypto
-@@ -126,8 +129,8 @@ build_package_psi() {
- 			QT_LIB_PATH=$QTDIR/lib
- 		fi
- 		cd $psi_base
--		export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework
--		./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal
-+		export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:$deps_base/$qjson_mac_dir/lib
-+		./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal --with-qjson-lib=$deps_base/$qjson_mac_dir/lib
- 		make
- 	fi
- }
---- git.orig/admin/build/devconfig.sh
-+++ git/admin/build/devconfig.sh
-@@ -60,7 +60,7 @@ if [ "$platform" == "win" ]; then
- 	fi
- 	mqtdir=`get_msys_path $qtdir`
- 
--	PATH=$mqtdir/bin:$PATH ./configure.exe --qtdir=$qtdir --release --with-qca-inc=$deps_base/$qca_win_dir/$target_arch/include --with-qca-lib=$deps_base/$qca_win_dir/$target_arch/lib --with-zlib-inc=$deps_base/$zlib_win_dir/$target_arch/include --with-zlib-lib=$deps_base/$zlib_win_dir/$target_arch/lib --with-aspell-inc=$deps_base/$aspell_win_dir/$target_arch/include --with-aspell-lib=$deps_base/$aspell_win_dir/$target_arch/lib
-+	PATH=$mqtdir/bin:$PATH ./configure.exe --qtdir=$qtdir --release --with-qca-inc=$deps_base/$qca_win_dir/$target_arch/include --with-qca-lib=$deps_base/$qca_win_dir/$target_arch/lib --with-zlib-inc=$deps_base/$zlib_win_dir/$target_arch/include --with-zlib-lib=$deps_base/$zlib_win_dir/$target_arch/lib --with-aspell-inc=$deps_base/$aspell_win_dir/$target_arch/include --with-aspell-lib=$deps_base/$aspell_win_dir/$target_arch/lib --with-qjson-inc=$deps_base/$qjson_win_dir/$target_arch/include --with-qjson-lib=$deps_base/$qjson_win_dir/$target_arch/lib
- 
- 	rm -f $build_base/devenv
- 	touch $build_base/devenv
-@@ -79,8 +79,8 @@ else
- 	if [ "$QT_PLUGIN_PATH" == "" ]; then
- 		QT_PLUGIN_PATH=$QTDIR/plugins
- 	fi
--	export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework
--	./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal
-+	export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:$deps_base/$qjson_mac_dir/lib
-+	./configure --with-qca-inc=$deps_base/$qca_mac_dir/include --with-qca-lib=$deps_base/$qca_mac_dir/lib --with-growl=$deps_base/$growl_dir/Framework --enable-universal --with-qjson-lib=$deps_base/$qjson_mac_dir/lib
- 
- 	# remove some gstbundle problem files
- 	rm -f $deps_base/$gstbundle_mac_dir/uni/lib/gstreamer-0.10/libgstximagesink.so
-@@ -91,7 +91,7 @@ else
- 	rm -f $build_base/devenv
- 	touch $build_base/devenv
- 	echo "export DYLD_LIBRARY_PATH=$deps_base/$gstbundle_mac_dir/uni/lib:\$DYLD_LIBRARY_PATH" >> $build_base/devenv
--	echo "export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:\$DYLD_FRAMEWORK_PATH" >> $build_base/devenv
-+	echo "export DYLD_FRAMEWORK_PATH=$QT_LIB_PATH:$deps_base/$qca_mac_dir/lib:$deps_base/$growl_dir/Framework:$deps_base/$qjson_mac_dir/lib:\$DYLD_FRAMEWORK_PATH" >> $build_base/devenv
- 	echo "export GST_PLUGIN_PATH=$deps_base/$gstbundle_mac_dir/uni/lib/gstreamer-0.10" >> $build_base/devenv
- 	echo "export GST_REGISTRY_FORK=no" >> $build_base/devenv
- 	echo "export QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$deps_base/$qca_mac_dir/plugins" >> $build_base/devenv
---- git.orig/admin/build/package_info
-+++ git/admin/build/package_info
-@@ -39,3 +39,11 @@ psimedia_win_dir=psimedia-20120725-win
- psimedia_mac_file=psimedia-20120725-mac.tar.bz2
- psimedia_mac_url=http://psi-im.org/files/deps/psimedia-20120725-mac.tar.bz2
- psimedia_mac_dir=psimedia-20120725-mac
-+
-+qjson_win_file=qjson-0.8.1-win.zip
-+qjson_win_url=http://psi-im.org/files/deps/qjson-0.8.1-win.zip
-+qjson_win_dir=qjson-0.8.1-win
-+
-+qjson_mac_file=qjson-0.8.1-mac.tar.bz2
-+qjson_mac_url=http://psi-im.org/files/deps/qjson-0.8.1-mac.tar.bz2
-+qjson_mac_dir=qjson-0.8.1-mac
---- git.orig/admin/build/prep_dist.sh
-+++ git/admin/build/prep_dist.sh
-@@ -45,8 +45,8 @@ if [ "$platform" == "mac" ]; then
- 
- 	mkdir -p $target_dist_base
- 
--	QT_FRAMEWORKS="QtCore QtNetwork QtXml QtGui"
--	QT_PLUGINS="imageformats/libqjpeg.dylib imageformats/libqgif.dylib imageformats/libqmng.dylib"
-+	QT_FRAMEWORKS="QtCore QtNetwork QtXml QtGui QtSql"
-+	QT_PLUGINS="imageformats/libqjpeg.dylib imageformats/libqgif.dylib imageformats/libqmng.dylib sqldrivers/libqsqlite.dylib"
- 	QCA_PLUGINS="crypto/libqca-ossl.dylib crypto/libqca-gnupg.dylib"
- 
- 	cp -a $psi_base/psi.app $target_dist_base/Psi.app
-@@ -57,6 +57,7 @@ if [ "$platform" == "mac" ]; then
- 	done
- 
- 	install_name_tool -change qca.framework/Versions/2/qca @executable_path/../Frameworks/qca.framework/Versions/2/qca $contentsdir/MacOS/psi
-+	install_name_tool -change qjson.framework/Versions/0.8.1/qjson @executable_path/../Frameworks/qjson.framework/Versions/0.8.1/qjson $contentsdir/MacOS/psi
- 
- 	mkdir -p $contentsdir/Frameworks
- 	for f in $QT_FRAMEWORKS; do
-@@ -80,8 +81,14 @@ if [ "$platform" == "mac" ]; then
- 	cp -a $deps_base/$qca_mac_dir/lib/qca.framework $contentsdir/Frameworks
- 	cleanup_framework $contentsdir/Frameworks/qca.framework qca 2
- 	install_name_tool -id @executable_path/../Frameworks/qca.framework/Versions/2/qca $contentsdir/Frameworks/qca.framework/qca
-+
-+	cp -a $deps_base/$qjson_mac_dir/lib/qjson.framework $contentsdir/Frameworks
-+	cleanup_framework $contentsdir/Frameworks/qjson.framework qjson 0.8.1
-+	install_name_tool -id @executable_path/../Frameworks/qjson.framework/Versions/0.8.1/qjson $contentsdir/Frameworks/qjson.framework/qjson
-+
- 	for g in $QT_FRAMEWORKS; do
- 		install_name_tool -change $g.framework/Versions/4/$g @executable_path/../Frameworks/$g.framework/Versions/4/$g $contentsdir/Frameworks/qca.framework/qca
-+		install_name_tool -change $g.framework/Versions/4/$g @executable_path/../Frameworks/$g.framework/Versions/4/$g $contentsdir/Frameworks/qjson.framework/qjson
- 	done
- 
- 	mkdir -p $contentsdir/Plugins/crypto
---- git.orig/options/default.xml
-+++ git/options/default.xml
-@@ -129,6 +129,9 @@
- 				<chatedit-height type="int">10</chatedit-height>
- 				<default-jid-mode comment="Default jid mode: barejid | auto" type="QString">barejid</default-jid-mode>
- 				<default-jid-mode-ignorelist comment="Default autojid mode ignore list: jid1,jid2,..." type="QString"></default-jid-mode-ignorelist>
-+				<history comment="Message history options">
-+					<preload-history-size comment="The number of preloaded messages" type="int">5</preload-history-size>
-+				</history>
- 			</chat>
- 			<save>
- 				<toolbars-state type="QByteArray"/>
-@@ -763,6 +766,9 @@ QLineEdit#le_status_text {
- 				<video-input type="QString"/>
- 			</devices>
- 		</media>
-+		<history comment="General history options">
-+			<store-muc-private comment="Keep a history of correspondence for MUC private" type="bool">false</store-muc-private>
-+		</history>
- 	</options>
- 	<accounts comment="Account definitions and options"/>
- 	<plugins comment="Plugin options"/>
---- git.orig/psi.qc
-+++ git/psi.qc
-@@ -17,6 +17,9 @@
-   <dep type='qca'>
-     <required/>
-   </dep>
-+  <dep type='qjson'>
-+    <required/>
-+  </dep>
-   <dep type='zlib'>
-     <required/>
-   </dep>
---- git.orig/qcm/qjson.qcm
-+++ git/qcm/qjson.qcm
-@@ -0,0 +1,162 @@
-+/*
-+-----BEGIN QCMOD-----
-+name: QJson
-+arg: with-qjson-inc=[path],Path to QJson include files
-+arg: with-qjson-lib=[path],Path to QJson library or framework files
-+-----END QCMOD-----
-+*/
-+
-+// adapted from json.prf
-+static QString internal_json_prf(const QString &incdir, const QString &libdir, const QString &frameworkdir)
-+{
-+	QString out = QString(
-+"QJSON_INCDIR = %1\n"
-+"QJSON_LIBDIR = %2\n"
-+"QJSON_FRAMEWORKDIR = %3\n"
-+"\n"
-+"CONFIG *= qt\n"
-+"\n"
-+"LINKAGE =\n"
-+"\n"
-+"!isEmpty(QJSON_FRAMEWORKDIR): {\n"
-+"	framework_dir = $$QJSON_FRAMEWORKDIR\n"
-+"	exists($$framework_dir/qjson.framework) {\n"
-+"		QMAKE_FRAMEWORKPATH *= $$framework_dir\n"
-+"		LIBS *= -F$$framework_dir\n"
-+"		INCLUDEPATH += $$framework_dir/qjson.framework\n"
-+"		LINKAGE = -framework qjson\n"
-+"	}\n"
-+"}\n"
-+"\n"
-+"# else, link normally\n"
-+"isEmpty(LINKAGE) {\n"
-+"	!isEmpty(QJSON_INCDIR):INCLUDEPATH += $$QJSON_INCDIR\n"
-+"	!isEmpty(QJSON_LIBDIR):LIBS += -L$$QJSON_LIBDIR\n"
-+"	LINKAGE = -lqjson\n"
-+"	CONFIG(debug, debug|release) {\n"
-+"		windows:LINKAGE = -lqjsond\n"
-+"		mac:LINKAGE = -lqjson_debug\n"
-+"	}\n"
-+"}\n"
-+"\n"
-+"LIBS += $$LINKAGE\n"
-+	).arg(incdir, libdir, frameworkdir);
-+	return out;
-+}
-+
-+// set either libdir or frameworkdir, but not both
-+static bool qjson_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release, bool debug, QString *_prf)
-+{
-+	QString proextra;
-+	QString prf = internal_json_prf(incdir, libdir, frameworkdir);
-+	proextra =
-+	"CONFIG += qt\n"
-+	"CONFIG -= debug_and_release debug release\n"

psi-plus-main-20160309.tar.xz/patches/dev/psi-plus-add-kde-icon.diff Deleted

@@ -1,229 +0,0 @@
---- git.orig/src/psitrayicon.cpp
-+++ git/src/psitrayicon.cpp
-@@ -4,6 +4,16 @@
- #include <QSystemTrayIcon>
- #include <QHelpEvent>
- 
-+#ifdef USE_KDE
-+#include <QDBusInterface>
-+#ifndef USE_KDE5
-+#include <kmenu.h>
-+#endif
-+static const QString KSNI_SERVICE = "org.kde.StatusNotifierWatcher";
-+static const QString KSNI_PATH = "/StatusNotifierWatcher";
-+static const QString KSNI_IFACE = "org.kde.StatusNotifierWatcher";
-+#endif
-+
- #include "psitrayicon.h"
- #include "iconset.h"
- #include "alerticon.h"
-@@ -14,18 +24,42 @@
- PsiTrayIcon::PsiTrayIcon(const QString &tip, QMenu *popup, QObject *parent)
- 	: QObject(parent)
- 	, icon_(NULL)
--	, trayicon_(new QSystemTrayIcon())
-+#ifdef USE_DBUS
-+	, newIcon_(KStatusNotifierItemPtr())
-+#endif
-+	, trayicon_(QSystemTrayIconPtr())
- 	, realIcon_(0)
- {	
--	trayicon_->setContextMenu(popup);
--	setToolTip(tip);
--	connect(trayicon_,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),SLOT(trayicon_activated(QSystemTrayIcon::ActivationReason)));
--	trayicon_->installEventFilter(this);
-+	bool newInterface = false;
-+#ifdef USE_KDE
-+	QDBusInterface iface(KSNI_SERVICE, KSNI_PATH, KSNI_IFACE);
-+	if (iface.isValid()) {
-+		newInterface = true;
-+		newIcon_ = KStatusNotifierItemPtr(new KStatusNotifierItem("Psi+",parent));
-+		newIcon_->setStatus(KStatusNotifierItem::Active);
-+		newIcon_->setTitle("Psi+");
-+#ifndef USE_KDE5
-+		newIcon_->setContextMenu(static_cast<KMenu*>(popup));
-+#else
-+		newIcon_->setContextMenu(popup);
-+#endif
-+		connect(newIcon_.data(), SIGNAL(activateRequested(bool,QPoint)), SLOT(iconActivated(bool,QPoint)));
-+		connect(newIcon_.data(), SIGNAL(secondaryActivateRequested(QPoint)), SLOT(iconActivatedSecondary(QPoint)));
-+		setToolTip(tip);
-+	}
-+#endif
-+	if (!newInterface) {
-+		trayicon_ = QSystemTrayIconPtr(new QSystemTrayIcon());
-+		trayicon_->setContextMenu(popup);
-+		setToolTip(tip);
-+		connect(trayicon_.data(),SIGNAL(activated(QSystemTrayIcon::ActivationReason)),SLOT(trayicon_activated(QSystemTrayIcon::ActivationReason)));
-+		trayicon_->installEventFilter(this);
-+	}
- }
- 
- PsiTrayIcon::~PsiTrayIcon()
- {
--	delete trayicon_;
-+	//delete trayicon_;
- 	if ( icon_ ) {
- 		icon_->disconnect();
- 		icon_->stop();
-@@ -35,13 +69,29 @@ PsiTrayIcon::~PsiTrayIcon()
- 
- void PsiTrayIcon::setContextMenu(QMenu* menu)
- {
--	trayicon_->setContextMenu(menu);
-+	if (trayicon_) {
-+		trayicon_->setContextMenu(menu);
-+	}
-+#ifdef USE_KDE
-+	else {
-+#ifndef USE_KDE5
-+		newIcon_->setContextMenu(static_cast<KMenu*>(menu));
-+#else
-+		newIcon_->setContextMenu(menu);
-+#endif
-+	}
-+#endif
- }
- 
- void PsiTrayIcon::setToolTip(const QString &str)
- {
- #ifndef HAVE_X11
- 	trayicon_->setToolTip(str);
-+#elif USE_KDE
-+	QIcon icon;
-+	if(icon_)
-+		icon = icon_->icon();
-+	newIcon_->setToolTip(icon, "Psi+", str);
- #else
- 	Q_UNUSED(str)
- #endif
-@@ -90,12 +140,22 @@ bool PsiTrayIcon::isWMDock()
- 
- void PsiTrayIcon::show()
- {
--	trayicon_->show();
-+	if(trayicon_)
-+		trayicon_->show();
-+#ifdef USE_KDE
-+	if (newIcon_)
-+		newIcon_->setStatus(KStatusNotifierItem::Active);
-+#endif
- }
- 
- void PsiTrayIcon::hide()
- {
--	trayicon_->hide();
-+	if(trayicon_)
-+		trayicon_->hide();
-+#ifdef USE_KDE
-+	if (newIcon_)
-+		newIcon_->setStatus(KStatusNotifierItem::Passive);
-+#endif
- }
- 
- 
-@@ -197,7 +257,14 @@ void PsiTrayIcon::animate()
- 		p = makeIcon();
- 		QPixmapCache::insert( cachedName, p );
- 	}
--	trayicon_->setIcon(p);
-+	if (trayicon_) {
-+		trayicon_->setIcon(p);
-+	}
-+#ifdef USE_KDE
-+	else {
-+		newIcon_->setIconByPixmap(p);
-+	}
-+#endif
- }
- 
- bool PsiTrayIcon::eventFilter(QObject *obj, QEvent *event)
-@@ -208,3 +275,16 @@ bool PsiTrayIcon::eventFilter(QObject *o
- 	}
- 	return QObject::eventFilter(obj, event);
- }
-+
-+#ifdef USE_KDE
-+void PsiTrayIcon::iconActivated(bool isIt, QPoint point)
-+{
-+	Q_UNUSED(isIt);
-+	emit doubleClicked(point);
-+}
-+
-+void PsiTrayIcon::iconActivatedSecondary(QPoint point) //Middle click
-+{
-+	emit clicked(point,Qt::MidButton);
-+}
-+#endif
---- git.orig/src/psitrayicon.h
-+++ git/src/psitrayicon.h
-@@ -5,11 +5,24 @@
- #include <QRgb>
- #include <QSystemTrayIcon>
- 
-+#ifdef USE_KDE
-+#ifndef USE_KDE5
-+#include <kstatusnotifieritem.h>
-+#else
-+#include <KStatusNotifierItem>
-+#endif
-+#include <QSharedPointer>
-+typedef QSharedPointer<KStatusNotifierItem> KStatusNotifierItemPtr;
-+#endif
-+
-+
- class PsiIcon;
- class QMenu;
- class QPoint;
- class QPixmap;
- 
-+typedef QSharedPointer<QSystemTrayIcon> QSystemTrayIconPtr;
-+
- class PsiTrayIcon : public QObject
- {
- 	Q_OBJECT
-@@ -38,6 +51,10 @@ public slots:
- private slots:
- 	void animate();
- 	void trayicon_activated(QSystemTrayIcon::ActivationReason);
-+#ifdef USE_KDE
-+	void iconActivated(bool isIt, QPoint point);
-+	void iconActivatedSecondary(QPoint point);
-+#endif
- 
- protected:
- 	QPixmap makeIcon();
-@@ -46,7 +63,10 @@ protected:
- 
- private:
- 	PsiIcon* icon_;

psi-plus-main-20160309.tar.xz/patches/dev/psi-plus-psimedia.patch Deleted

@@ -1,81 +0,0 @@
-diff --git a/psi.qc b/psi.qc
-index 1f74092..70c99a6 100644
---- a/psi.qc
-+++ b/psi.qc
-@@ -42,6 +42,7 @@
-   <dep type='conf'>
-     <required/>
-   </dep>
-+  <dep type='psimedia'/>
-   <dep type='recursiveprl'>
-     <required/>
-   </dep>
-diff --git a/qcm/psimedia.qcm b/qcm/psimedia.qcm
-new file mode 100644
-index 0000000..cae88b6
---- /dev/null
-+++ b/qcm/psimedia.qcm
-@@ -0,0 +1,34 @@
-+/*
-+-----BEGIN QCMOD-----
-+name: psimedia
-+arg: with-psimedia-path=[path],Extra search path to libgstprovider.so
-+-----END QCMOD-----
-+*/
-+
-+//----------------------------------------------------------------------------
-+// qc_psimedia
-+//----------------------------------------------------------------------------
-+class qc_psimedia : public ConfObj
-+{
-+public:
-+	qc_psimedia(Conf *c) : ConfObj(c) {}
-+	QString name() const { return "psimedia"; }
-+	QString shortname() const { return "psimedia"; }
-+
-+	bool exec()
-+	{
-+		QString path = conf->getenv("QC_WITH_PSIMEDIA_PATH");
-+		if (path.isEmpty()) {
-+			return false;
-+		}
-+
-+		conf->addDefine("HAVE_GSTPROVIDER_PATH");
-+		QFile file("src/config.h");
-+		if ( file.open(QIODevice::Append | QIODevice::Text) ) {
-+			QTextStream stream( &file );
-+			stream << "#define GSTPROVIDER_PATH \"" << path << "\"" << endl;
-+		}
-+
-+		return true;
-+	}
-+};
-diff --git a/src/avcall/avcall.cpp b/src/avcall/avcall.cpp
-index 38fff17..320a4b3 100644
---- a/src/avcall/avcall.cpp
-+++ b/src/avcall/avcall.cpp
-@@ -30,6 +30,7 @@
- #include "applicationinfo.h"
- #include "psiaccount.h"
- #include "psioptions.h"
-+#include "../config.h"
- 
- #define USE_THREAD
- 
-@@ -108,6 +109,16 @@ static void ensureLoaded()
- 		QString resourcePath;
- 
- 		pluginFile = qgetenv("PSI_MEDIA_PLUGIN");
-+
-+#ifdef HAVE_GSTPROVIDER_PATH
-+		if(pluginFile.isEmpty())
-+		{
-+			QFileInfo fi(GSTPROVIDER_PATH);
-+			if(fi.exists())
-+				pluginFile = GSTPROVIDER_PATH;
-+		}
-+#endif
-+
- 		if(pluginFile.isEmpty())
- 		{
- #if defined(Q_OS_WIN)

psi-plus-main-20160309.tar.xz/patches/dev/psi-win32-crash-dialog.patch Deleted

@@ -1,1581 +0,0 @@
-Index: src/tools/crash/crash.pri
-===================================================================
---- orig/src/tools/crash/crash.pri	(revision 944)
-+++ work/src/tools/crash/crash.pri	(working copy)
-@@ -16,6 +16,12 @@
- 		SOURCES +=  $$PWD/crash.cpp 
- 	}
- }
--else {
-+
-+win32 {
-+	SOURCES     += $$PWD/crash_win32.cpp $$PWD/stackwalker.cpp
-+	HEADERS     += $$PWD/crash_win32.h $$PWD/stackwalker.h
-+}
-+
-+macx {
- 	SOURCES += $$PWD/crash_dummy.cpp
- }
---- orig/src/tools/crash/crash_win32.h	1970-01-01 03:00:00.000000000 +0300
-+++ work/src/tools/crash/crash_win32.h	2008-01-23 10:30:52.388649000 +0300
-@@ -0,0 +1,123 @@
-+/*
-+ * crash_win32 -- win32 crash handlers
-+ *
-+ * Copyright (c) 2008 Ustyugov Roman (qtdevel@gmail.com)
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included
-+ * in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+#ifndef CRASH_WIN32_H
-+#define CRASH_WIN32_H
-+
-+#include "crash.h"
-+#include "stackwalker.h"
-+#include <QtGui>
-+
-+namespace Crash {
-+
-+/**
-+ *	Simple dialog to show crash log.
-+ *	Must be created in GUI thread.
-+ */
-+class CrashDialog : public QDialog
-+{
-+	Q_OBJECT
-+
-+public:
-+	CrashDialog(QString text, QWidget *parent = 0)
-+		: QDialog(parent)
-+	{
-+		//	Create readonly text editor for logging
-+		editor_ = new QTextEdit(this);
-+		editor_->setText(text);
-+		editor_->setReadOnly(true);
-+		QGridLayout *mainLayout = new QGridLayout;
-+		mainLayout->setContentsMargins(3,3,3,3);
-+		setWindowTitle(tr("Crash handler log")); 
-+		mainLayout->addWidget(editor_, 0, 0);
-+		setLayout(mainLayout);
-+		setModal(true);
-+	}
-+
-+private:
-+	QTextEdit * editor_;
-+};
-+
-+
-+/**
-+ *	Simple implementation of stack walker with output accumulation.
-+ *	Output may be redirected to file (or crash dialog)
-+ */
-+class Win32StackWalker : public StackWalker
-+{
-+private:
-+	QString text_;
-+
-+public:
-+	Win32StackWalker() : StackWalker() {}
-+
-+	BOOL ShowCallstack(
-+		HANDLE hThread = GetCurrentThread(),
-+		CONTEXT *context = NULL,
-+		PReadProcessMemoryRoutine readMemoryFunction = NULL,
-+		LPVOID pUserData = NULL
-+		)
-+	{
-+		BOOL res = StackWalker::ShowCallstack(hThread, context, readMemoryFunction, pUserData);
-+#if 1
-+		//	Write crash log to file.
-+		//	Log file will be created in working directory of Psi application
-+		//	or in the root of drive "C", if application directory path is undefined.
-+		QString path = qApp->applicationDirPath();
-+		if (path.isEmpty()) {
-+			path = "c:";
-+		}
-+		path += "/psi_crash.log";
-+		QFile crashLog(path);
-+		if (crashLog.open(QIODevice::WriteOnly | QIODevice::Append)) {
-+			QString log = "\n\n------------------------------------------------------------------------------------------------\n";
-+			log += "Log is created at ";
-+			log += QDateTime::currentDateTime().toString(Qt::SystemLocaleDate) + "\n";
-+			log += "\nCall stack:\n\n";
-+			//	Add callstack log
-+			log += text_;
-+			//	Make right end of line
-+			log.replace("\n", "\r\n");
-+			crashLog.write(log.toLatin1());
-+			crashLog.close();
-+		}
-+#else
-+		//	This code may cause an exception, because
-+		//	crash dialog must be created in GUI thread.
-+		//	That's why there is more preferable to use file log as written above.
-+		CrashDialog cd(text_);
-+		cd.resize(640, 512);
-+		cd.exec();
-+#endif
-+		return res;
-+	}
-+
-+	//	Accumulate output in string
-+	virtual void OnOutput(LPCSTR szText) {
-+		text_ += szText;
-+	}
-+};
-+
-+}; // namespace Crash
-+
-+#endif
---- orig/src/tools/crash/crash_win32.cpp	1970-01-01 03:00:00.000000000 +0300
-+++ work/src/tools/crash/crash_win32.cpp	2008-01-23 09:47:01.029274000 +0300
-@@ -0,0 +1,19 @@
-+#include "crash_win32.h"
-+
-+namespace Crash {
-+
-+// The exception filter function
-+LONG WINAPI ExpFilter(EXCEPTION_POINTERS* pExp)
-+{
-+	Win32StackWalker sw;
-+	sw.ShowCallstack(GetCurrentThread(), pExp->ContextRecord);
-+	return EXCEPTION_EXECUTE_HANDLER;
-+}
-+
-+void registerSigsegvHandler(QString progname)
-+{
-+	//	Enable an application to supersede the top-level exception handler
-+	SetUnhandledExceptionFilter(ExpFilter);
-+}
-+
-+}; // namespace Crash
---- orig/src/tools/crash/stackwalker.h	1970-01-01 03:00:00.000000000 +0300
-+++ work/src/tools/crash/stackwalker.h	2005-11-07 07:07:48.000000000 +0300
-@@ -0,0 +1,189 @@
-+/**********************************************************************
-+ * 
-+ * StackWalker.h
-+ *
-+ *
-+ * History:
-+ *  2005-07-27   v1    - First public release on http://www.codeproject.com/
-+ *  (for additional changes see History in 'StackWalker.cpp'!
-+ *
-+ **********************************************************************/
-+// #pragma once is supported starting with _MCS_VER 1000, 
-+// so we need not to check the version (because we only support _MSC_VER >= 1100)!
-+#pragma once
-+
-+#include <windows.h>
-+
-+// special defines for VC5/6 (if no actual PSDK is installed):
-+#if _MSC_VER < 1300
-+typedef unsigned __int64 DWORD64, *PDWORD64;
-+#if defined(_WIN64)
-+typedef unsigned __int64 SIZE_T, *PSIZE_T;
-+#else
-+typedef unsigned long SIZE_T, *PSIZE_T;
-+#endif
-+#endif  // _MSC_VER < 1300
-+
-+class StackWalkerInternal;  // forward
-+class StackWalker
-+{
-+public:

psi-plus-main-20160309.tar.xz/patches/dev/psi_new_jingle_rtp.patch Deleted

@@ -1,2126 +0,0 @@
-diff --git a/iris b/iris
---- a/iris
-+++ b/iris
-@@ -1 +1 @@
--Subproject commit 6373822ebded777f9f26fe53374ae81262dfe2cc
-+Subproject commit 6373822ebded777f9f26fe53374ae81262dfe2cc-dirty
-diff --git a/src/avcall/avcall.cpp b/src/avcall/avcall.cpp
-index c398bab..858ba7d 100644
---- a/src/avcall/avcall.cpp
-+++ b/src/avcall/avcall.cpp
-@@ -131,9 +131,9 @@ static void ensureLoaded()
- 	}
- }
- 
--static JingleRtpPayloadType payloadInfoToPayloadType(const PsiMedia::PayloadInfo &pi)
-+static Jingle::Rtp::PayloadType payloadInfoToPayloadType(const PsiMedia::PayloadInfo &pi)
- {
--	JingleRtpPayloadType out;
-+	Jingle::Rtp::PayloadType out;
- 	out.id = pi.id();
- 	out.name = pi.name();
- 	out.clockrate = pi.clockrate();
-@@ -142,7 +142,7 @@ static JingleRtpPayloadType payloadInfoToPayloadType(const PsiMedia::PayloadInfo
- 	out.maxptime = pi.maxptime();
- 	foreach(const PsiMedia::PayloadInfo::Parameter &pip, pi.parameters())
- 	{
--		JingleRtpPayloadType::Parameter ptp;
-+		Jingle::Rtp::PayloadType::Parameter ptp;
- 		ptp.name = pip.name;
- 		ptp.value = pip.value;
- 		out.parameters += ptp;
-@@ -150,7 +150,7 @@ static JingleRtpPayloadType payloadInfoToPayloadType(const PsiMedia::PayloadInfo
- 	return out;
- }
- 
--static PsiMedia::PayloadInfo payloadTypeToPayloadInfo(const JingleRtpPayloadType &pt)
-+static PsiMedia::PayloadInfo payloadTypeToPayloadInfo(const Jingle::Rtp::PayloadType &pt)
- {
- 	PsiMedia::PayloadInfo out;
- 	out.setId(pt.id);
-@@ -160,7 +160,7 @@ static PsiMedia::PayloadInfo payloadTypeToPayloadInfo(const JingleRtpPayloadType
- 	out.setPtime(pt.ptime);
- 	out.setMaxptime(pt.maxptime);
- 	QList<PsiMedia::PayloadInfo::Parameter> list;
--	foreach(const JingleRtpPayloadType::Parameter &ptp, pt.parameters)
-+	foreach(const Jingle::Rtp::PayloadType::Parameter &ptp, pt.parameters)
- 	{
- 		PsiMedia::PayloadInfo::Parameter pip;
- 		pip.name = ptp.name;
-@@ -177,9 +177,9 @@ class AvTransmit : public QObject
- 
- public:
- 	PsiMedia::RtpChannel *audio, *video;
--	JingleRtpChannel *transport;
-+	Jingle::Rtp::Channel *transport;
- 
--	AvTransmit(PsiMedia::RtpChannel *_audio, PsiMedia::RtpChannel *_video, JingleRtpChannel *_transport, QObject *parent = 0) :
-+	AvTransmit(PsiMedia::RtpChannel *_audio, PsiMedia::RtpChannel *_video, Jingle::Rtp::Channel *_transport, QObject *parent = 0) :
- 		QObject(parent),
- 		audio(_audio),
- 		video(_video),
-@@ -218,8 +218,8 @@ private slots:
- 		{
- 			PsiMedia::RtpPacket packet = audio->read();
- 
--			JingleRtp::RtpPacket jpacket;
--			jpacket.type = JingleRtp::Audio;
-+			Session::RtpPacket jpacket;
-+			jpacket.type = Session::Audio;
- 			jpacket.portOffset = packet.portOffset();
- 			jpacket.value = packet.rawValue();
- 
-@@ -233,8 +233,8 @@ private slots:
- 		{
- 			PsiMedia::RtpPacket packet = video->read();
- 
--			JingleRtp::RtpPacket jpacket;
--			jpacket.type = JingleRtp::Video;
-+			Session::RtpPacket jpacket;
-+			jpacket.type = Session::Video;
- 			jpacket.portOffset = packet.portOffset();
- 			jpacket.value = packet.rawValue();
- 
-@@ -246,11 +246,11 @@ private slots:
- 	{
- 		while(transport->packetsAvailable())
- 		{
--			JingleRtp::RtpPacket jpacket = transport->read();
-+			Session::RtpPacket jpacket = transport->read();
- 
--			if(jpacket.type == JingleRtp::Audio)
-+			if(jpacket.type == Session::Audio)
- 				audio->write(PsiMedia::RtpPacket(jpacket.value, jpacket.portOffset));
--			else if(jpacket.type == JingleRtp::Video)
-+			else if(jpacket.type == Session::Video)
- 				video->write(PsiMedia::RtpPacket(jpacket.value, jpacket.portOffset));
- 		}
- 	}
-@@ -341,7 +341,7 @@ class AvCallManagerPrivate : public QObject
- public:
- 	AvCallManager *q;
- 	PsiAccount *pa;
--	JingleRtpManager *rtpManager;
-+	Jingle::Rtp::Manager *rtpManager;
- 	QList<AvCall*> sessions;
- 	QList<AvCall*> pending;
- 
-@@ -362,7 +362,7 @@ public:
- 	AvCall *q;
- 	AvCallManagerPrivate *manager;
- 	bool incoming;
--	JingleRtp *sess;
-+	Session *sess;
- 	PsiMedia::RtpSession rtp;
- 	XMPP::Jid peer;
- 	AvCall::Mode mode;
-@@ -465,11 +465,11 @@ public:
- 		//   localMediaUpdated()
- 		int types;
- 		if(mode == AvCall::Both)
--			types = JingleRtp::Audio | JingleRtp::Video;
-+			types = Session::Audio | Session::Video;
- 		else if(mode == AvCall::Audio)
--			types = JingleRtp::Audio;
-+			types = Session::Audio;
- 		else // Video
--			types = JingleRtp::Video;
-+			types = Session::Video;
- 
- 		sess->accept(types);
- 		start_rtp();
-@@ -597,18 +597,18 @@ private:
- 	{
- 		if(transmitAudio)
- 		{
--			QList<JingleRtpPayloadType> payloadTypes = sess->remoteAudioPayloadTypes();
-+			QList<Jingle::Rtp::PayloadType> payloadTypes = sess->remoteAudioPayloadTypes();
- 			QList<PsiMedia::PayloadInfo> list;
--			foreach(const JingleRtpPayloadType &pt, payloadTypes)
-+			foreach(const Jingle::Rtp::PayloadType &pt, payloadTypes)
- 				list += payloadTypeToPayloadInfo(pt);
- 			rtp.setRemoteAudioPreferences(list);
- 		}
- 
- 		if(transmitVideo)
- 		{
--			QList<JingleRtpPayloadType> payloadTypes = sess->remoteVideoPayloadTypes();
-+			QList<Jingle::Rtp::PayloadType> payloadTypes = sess->remoteVideoPayloadTypes();
- 			QList<PsiMedia::PayloadInfo> list;
--			foreach(const JingleRtpPayloadType &pt, payloadTypes)
-+			foreach(const Jingle::Rtp::PayloadType &pt, payloadTypes)
- 				list += payloadTypeToPayloadInfo(pt);
- 			rtp.setRemoteVideoPreferences(list);
- 		}
-@@ -674,14 +674,14 @@ private slots:
- 
- 		if(pAudio)
- 		{
--			JingleRtpPayloadType pt = payloadInfoToPayloadType(*pAudio);
--			sess->setLocalAudioPayloadTypes(QList<JingleRtpPayloadType>() << pt);
-+			Jingle::Rtp::PayloadType pt = payloadInfoToPayloadType(*pAudio);
-+			sess->setLocalAudioPayloadTypes(QList<Jingle::Rtp::PayloadType>() << pt);
- 		}
- 
- 		if(pVideo)
- 		{
--			JingleRtpPayloadType pt = payloadInfoToPayloadType(*pVideo);
--			sess->setLocalVideoPayloadTypes(QList<JingleRtpPayloadType>() << pt);
-+			Jingle::Rtp::PayloadType pt = payloadInfoToPayloadType(*pVideo);
-+			sess->setLocalVideoPayloadTypes(QList<Jingle::Rtp::PayloadType>() << pt);
- 		}
- 
- 		if(!incoming)
-@@ -716,13 +716,13 @@ private slots:
- 
- 	void sess_error()
- 	{
--		JingleRtp::Error e = sess->errorCode();
--		if(e == JingleRtp::ErrorTimeout)
-+		Session::Error e = sess->errorCode();
-+		if(e == Session::ErrorTimeout)
- 		{
- 			errorString = tr("Call negotiation timed out.");
- 			cleanup();
- 		}
--		else if(e == JingleRtp::ErrorICE)
-+		else if(e == Session::ErrorICE)
- 		{
- 			errorString = tr("Unable to establish peer-to-peer connection.");
- 			reject();
-@@ -843,7 +843,7 @@ AvCallManagerPrivate::AvCallManagerPrivate(PsiAccount *_pa, AvCallManager *_q) :
- 	q(_q),
- 	pa(_pa)
- {
--	rtpManager = new JingleRtpManager(pa->client());
-+	rtpManager = new Jingle::Rtp::Manager(pa->client());
- 	connect(rtpManager, SIGNAL(incomingReady()), SLOT(rtp_incomingReady()));
- }
-

psi-plus-main-20160309.tar.xz/patches/extra Deleted

psi-plus-main-20160309.tar.xz/patches/extra/0220-psi-send-button-context-menu.diff Deleted

@@ -1,1410 +0,0 @@
-Заходим в «iris»
-Заходим в «src/libpsi»
---- a/options/default.xml
-+++ b/options/default.xml
-@@ -114,6 +114,7 @@
- 				<use-message-icons type="bool">true</use-message-icons>
- 				<scaled-message-icons type="bool">false</scaled-message-icons>
- 				<warn-before-clear type="bool">true</warn-before-clear>
-+				<only-paste-template type="bool">false</only-paste-template>
- 			</chat>
- 			<save>
- 				<toolbars-state type="QByteArray"/>
---- a/src/chatdlg.ui
-+++ b/src/chatdlg.ui
-@@ -292,6 +292,9 @@
-            <property name="toolTip">
-             <string>Send</string>
-            </property>
-+           <property name="contextMenuPolicy" >
-+            <enum>Qt::CustomContextMenu</enum>
-+           </property>
-           </widget>
-          </item>
-          <item>
---- a/src/groupchatdlg.cpp
-+++ b/src/groupchatdlg.cpp
-@@ -207,7 +207,7 @@ public:
- 	QString password;
- 	QString topic;
- 	bool nonAnonymous;		 // got status code 100 ?
--	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_bookmark;
-+	IconAction *act_find, *act_clear, *act_icon, *act_configure, *act_bookmark, *act_ps, *act_templates;
- #ifdef WHITEBOARDING
- 	IconAction *act_whiteboard;
- #endif
-@@ -606,6 +606,13 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 
- 	d->state = Private::Connected;
- 
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		connect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		connect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		connect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
-+	}
-+
- 	setAcceptDrops(true);
- 
- #ifndef Q_OS_MAC
-@@ -689,6 +696,11 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 	connect(bm, SIGNAL(conferencesChanged(QList<ConferenceBookmark>)), SLOT(updateBookmarkIcon()));
- 	connect(bm, SIGNAL(bookmarksSaved()), SLOT(updateBookmarkIcon()));
- 
-+	d->act_ps = new IconAction(tr("Paste and Send"), "psi/action_paste_and_send", tr("Paste and Send"), 0, this);
-+	connect(d->act_ps, SIGNAL(triggered()), SLOT(doPasteAndSend()));
-+
-+	d->act_templates = new IconAction(tr("Templates"), "psi/action_templates", tr("Templates"), 0, this);
-+	d->act_templates->setMenu(getTemplateMenu());
- 	ui_.toolbar->setIconSize(QSize(16,16));
- 	ui_.toolbar->addAction(d->act_clear);
- 	ui_.toolbar->addAction(d->act_configure);
-@@ -697,6 +709,10 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- #endif
- 	ui_.toolbar->addWidget(new StretchWidget(ui_.toolbar));
- 	ui_.toolbar->addAction(d->act_icon);
-+	((QToolButton *)ui_.toolbar->widgetForAction(d->act_icon))->setPopupMode(QToolButton::InstantPopup);
-+	ui_.toolbar->addAction(d->act_templates);
-+	((QToolButton *)ui_.toolbar->widgetForAction(d->act_templates))->setPopupMode(QToolButton::InstantPopup);
-+	ui_.toolbar->addAction(d->act_ps);
- 	ui_.toolbar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum);
- 
- 	// Common actions
-@@ -705,6 +721,7 @@ GCMainDlg::GCMainDlg(PsiAccount *pa, const Jid &j, TabManager *tabManager)
- 	connect(d->act_send,SIGNAL(triggered()), SLOT(mle_returnPressed()));
-  	ui_.pb_send->setIcon(IconsetFactory::icon("psi/action_button_send").icon());
- 	connect(ui_.pb_send, SIGNAL(clicked()), SLOT(mle_returnPressed()));
-+	connect(ui_.pb_send, SIGNAL(customContextMenuRequested(const QPoint)), SLOT(sendButtonMenu()));
- 	d->act_close = new QAction(this);
- 	addAction(d->act_close);
- 	connect(d->act_close,SIGNAL(triggered()), SLOT(close()));
-@@ -763,6 +780,13 @@ GCMainDlg::~GCMainDlg()
- 	account()->dialogUnregister(this);
- 	delete d->mucManager;
- 	delete d;
-+
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		disconnect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		disconnect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		disconnect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));
-+	}
- }
- 
- void GCMainDlg::ensureTabbedCorrectly()
-@@ -1869,6 +1893,8 @@ void GCMainDlg::buildMenu()
- 	d->pm_settings->addSeparator();
- 
- 	d->pm_settings->addAction(d->act_icon);
-+	d->pm_settings->addAction(d->act_templates);
-+	d->pm_settings->addAction(d->act_ps);
- 	d->pm_settings->addAction(d->act_nick);
- 	d->pm_settings->addAction(d->act_bookmark);
- }
-@@ -1901,6 +1927,50 @@ void GCMainDlg::setStatusTabIcon(int status)
- 	setTabIcon(PsiIconset::instance()->statusPtr(jid(), status)->icon());
- }
- 
-+void GCMainDlg::sendButtonMenu()
-+{
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		menu->setParams(true);
-+		menu->exec(QCursor::pos());
-+		menu->setParams(false);
-+		d->mle()->setFocus();
-+	}
-+}
-+
-+void GCMainDlg::editTemplates()
-+{
-+	if(TabbableWidget::isActiveTab()) {
-+		showTemplateEditor();
-+	}
-+}
-+
-+void GCMainDlg::doPasteAndSend()
-+{
-+	if(TabbableWidget::isActiveTab()) {
-+		d->mle()->paste();
-+		mle_returnPressed();
-+		d->act_ps->setEnabled(false);
-+		QTimer::singleShot(2000, this, SLOT(psButtonEnabled()));
-+	}
-+}
-+
-+void GCMainDlg::psButtonEnabled()
-+{
-+	d->act_ps->setEnabled(true);
-+}
-+
-+void GCMainDlg::sendTemp(const QString &templText)
-+{
-+	if(TabbableWidget::isActiveTab()) {
-+		if (!templText.isEmpty()) {
-+			d->mle()->textCursor().insertText(templText);
-+			if (!PsiOptions::instance()->getOption("options.ui.chat.only-paste-template").toBool())
-+				mle_returnPressed();
-+		}
-+	}
-+}
-+
- //----------------------------------------------------------------------------
- // GCFindDlg
- //----------------------------------------------------------------------------
---- a/src/groupchatdlg.h
-+++ b/src/groupchatdlg.h
-@@ -138,6 +138,11 @@ private slots:
- 	void openWhiteboard();
- #endif
- 	void chatEditCreated();
-+	void sendButtonMenu();
-+	void editTemplates();
-+	void doPasteAndSend();
-+	void sendTemp(const QString &);
-+	void psButtonEnabled();
- 
- public:
- 	class Private;
---- a/src/groupchatdlg.ui
-+++ b/src/groupchatdlg.ui
-@@ -289,6 +289,9 @@
-            <property name="toolTip">
-             <string>Send</string>
-            </property>
-+           <property name="contextMenuPolicy" >
-+            <enum>Qt::CustomContextMenu</enum>
-+           </property>
-           </widget>
-          </item>
-         </layout>
---- a/src/psichatdlg.cpp
-+++ b/src/psichatdlg.cpp
-@@ -18,6 +18,7 @@
- #include <QDragEnterEvent>
- #include <QMessageBox>
- #include <QDebug>
-+#include <QTimer>
- 
- #include "psicon.h"
- #include "psiaccount.h"
-@@ -171,6 +172,22 @@ PsiChatDlg::PsiChatDlg(const Jid& jid, PsiAccount* pa, TabManager* tabManager)
- {
- 	connect(account()->psi(), SIGNAL(accountCountChanged()), this, SLOT(updateIdentityVisibility()));
- 	mCmdManager_.registerProvider(new ChatDlgMCmdProvider(this));
-+	SendButtonTemplatesMenu* menu = getTemplateMenu();
-+	if (menu) {
-+		connect(menu, SIGNAL(doPasteAndSend()), this, SLOT(doPasteAndSend()));
-+		connect(menu, SIGNAL(doEditTemplates()), this, SLOT(editTemplates()));
-+		connect(menu, SIGNAL(doTemplateText(const QString &)), this, SLOT(sendTemp(const QString &)));

psi-plus-main-20160309.tar.xz/patches/haiku Deleted

psi-plus-main-20160309.tar.xz/patches/haiku/4000-fix-psiplus-build-in-haiku.patch Deleted

@@ -1,498 +0,0 @@
---- a/iris/src/jdns/jdns_p.h
-+++ b/iris/src/jdns/jdns_p.h
-@@ -44,6 +44,8 @@
- # define JDNS_OS_SOLARIS
- #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
- # define JDNS_OS_MAC
-+#elif defined(__HAIKU__)
-+# define JDNS_OS_HAIKU
- #endif
- 
- #ifdef JDNS_OS_WIN
---- a/iris/src/jdns/jdns_sys.c
-+++ b/iris/src/jdns/jdns_sys.c
-@@ -726,8 +726,8 @@ static int my_res_init()
- //   a define, so the #ifdef doesn't work.  as a workaround, we'll explicitly
- //   specify the platforms that have __res_state_ext
- //#ifdef __res_state_ext
--#if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || \
--    defined(JDNS_OS_NETBSD) || defined (JDNS_OS_SOLARIS)
-+#if defined(JDNS_OS_MAC) || defined(JDNS_OS_FREEBSD) || defined(JDNS_OS_NETBSD) \
-+	|| defined (JDNS_OS_SOLARIS) || defined (JDNS_OS_HAIKU)
- # define USE_EXTEXT
- #endif
- 
---- a/iris/src/jdns/qjdns_sock.cpp
-+++ b/iris/src/jdns/qjdns_sock.cpp
-@@ -46,6 +46,7 @@
- 
- #ifndef QT_NO_IPV6
- # define HAVE_IPV6
-+#ifndef Q_OS_HAIKU
- # ifndef s6_addr
- #  define IPPROTO_IPV6 41
-    struct in6_addr
-@@ -59,6 +60,7 @@
-    };
- #  define s6_addr _S6_un._S6_u8
- # endif
-+#endif
- # ifndef IPV6_JOIN_GROUP
- #  define IPV6_JOIN_GROUP 12
- #  define IPV6_MULTICAST_HOPS 10
---- a/src/applicationinfo.cpp
-+++ b/src/applicationinfo.cpp
-@@ -160,7 +160,7 @@ QString ApplicationInfo::resourcesDir()
- {
- #if defined(HAVE_X11)
- 	return PSI_DATADIR;
--#elif defined(Q_OS_WIN)
-+#elif defined(Q_OS_WIN) || defined(Q_WS_HAIKU)
- 	return qApp->applicationDirPath();
- #elif defined(Q_OS_MAC)
- 	// FIXME: Clean this up (remko)
-@@ -297,6 +297,10 @@ QString ApplicationInfo::homeDir(ApplicationInfo::HomedirType type)
- 				QMessageBox::information(0, QObject::tr("Conversion Error"), QObject::tr("Configuration data for a previous version of Psi was found, but it was not possible to convert it to work with the current version. Ensure you have appropriate permission and that another copy of Psi is not running, and try again."));
- 				exit(0);
- 			}
-+#elif defined Q_OS_HAIKU
-+			QDir configDir(QDir::homePath() + "/.config/" + sname());
-+			QDir cacheDir(QDir::homePath() + "/.cache/" + sname());
-+			QDir dataDir(configDir);
- #endif
- 			configDir_ = configDir.path();
- 			cacheDir_ = cacheDir.path();
---- a/src/libpsi/tools/globalshortcut/globalshortcut.pri
-+++ b/src/libpsi/tools/globalshortcut/globalshortcut.pri
-@@ -2,7 +2,7 @@ HEADERS += $$PWD/globalshortcutmanager.h $$PWD/globalshortcuttrigger.h
- SOURCES += $$PWD/globalshortcutmanager.cpp
- DEPENDPATH  += $$PWD
- 
--unix:!mac {
-+unix:!mac:!haiku {
- 	SOURCES += $$PWD/globalshortcutmanager_x11.cpp
- }
- win32: {
-@@ -16,3 +16,6 @@ mac: {
- 	HEADERS += \
- 		$$PWD/NDKeyboardLayout.h
- }
-+haiku: {
-+	SOURCES += $$PWD/globalshortcutmanager_haiku.cpp
-+}
---- a/src/libpsi/tools/tools.pri
-+++ b/src/libpsi/tools/tools.pri
-@@ -25,7 +25,7 @@ SOURCES += \
- 	$$PWD/priorityvalidator.cpp \
- 	$$PWD/iodeviceopener.cpp
- 
--unix:!mac {
-+unix:!mac:!haiku {
- 	HEADERS += $$PWD/x11info.h
- 	SOURCES += $$PWD/x11info.cpp
- }
---- a/src/src.pri
-+++ b/src/src.pri
-@@ -6,7 +6,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
- 
-   unix:!mac:LIBS += -lxcb
- }
--unix:!mac:DEFINES += HAVE_X11
-+unix:!mac:!haiku:DEFINES += HAVE_X11
- 
- # modules
- include($$PWD/protocol/protocol.pri)
---- a/src/systeminfo.cpp
-+++ b/src/systeminfo.cpp
-@@ -26,6 +26,14 @@
- #include <windows.h>
- #endif
- 
-+#if defined(Q_WS_HAIKU)
-+#include <sys/utsname.h>
-+#include <Path.h>
-+#include <FindDirectory.h>
-+#include <AppFileInfo.h>
-+extern "C" const char* __get_haiku_revision();
-+#endif
-+
- #include "systeminfo.h"
- 
- #if defined(HAVE_X11)
-@@ -172,7 +180,7 @@ SystemInfo::SystemInfo() : QObject(QCoreApplication::instance())
- 	os_str_ = "Unknown";
- 
- 	// Detect
--#if defined(HAVE_X11) || defined(Q_OS_MAC)
-+#if defined(HAVE_X11) || defined(Q_OS_MAC) || defined(Q_WS_HAIKU)
- 	time_t x;
- 	time(&x);
- 	char str[256];
-@@ -225,6 +233,31 @@ SystemInfo::SystemInfo() : QObject(QCoreApplication::instance())
- 		default:
- 			os_str_ = "Mac OS X";
- 	}
-+#elif defined(Q_WS_HAIKU)
-+	QString strVersion("Haiku");
-+	BPath path;
-+	if (find_directory(B_BEOS_LIB_DIRECTORY, &path) == B_OK) {
-+		path.Append("libbe.so");
-+
-+		BAppFileInfo appFileInfo;
-+		version_info versionInfo;
-+		BFile file;
-+		if (file.SetTo(path.Path(), B_READ_ONLY) == B_OK
-+			&& appFileInfo.SetTo(&file) == B_OK
-+			&& appFileInfo.GetVersionInfo(&versionInfo, 
-+				B_APP_VERSION_KIND) == B_OK
-+			&& versionInfo.short_info[0] != '\0')
-+				strVersion = versionInfo.short_info;
-+	}
-+
-+	 const char* haikuRevision = __get_haiku_revision();
-+       if (haikuRevision != NULL) {
-+               os_str_ = "Haiku";
-+               os_str_ += " ( " + strVersion + " Rev. ";
-+               os_str_ += haikuRevision;
-+               os_str_ += ")";
-+       }
-+
- #endif
- 
- #if defined(Q_OS_WIN)
---- /dev/null
-+++ b/src/libpsi/tools/globalshortcut/globalshortcutmanager_haiku.cpp
-@@ -0,0 +1,333 @@
-+/*
-+ * globalshortcutmanager_haiku.cpp - Haiku implementation of global shortcuts by Vitaly (Diger)
-+ * Based on X11 implementation of global shortcuts
-+ * Copyright (C) 2003-2006  Justin Karneges, Maciej Niedzielski
-+ *
-+ * 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 2
-+ * 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 library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "globalshortcutmanager.h"
-+#include "globalshortcuttrigger.h"
-+
-+#include <InterfaceDefs.h>
-+
-+#include <QWidget>
-+#include <QCoreApplication>
-+
-+
-+class HKeyTrigger
-+{
-+public:
-+	virtual ~HKeyTrigger() {}

psi-plus-main-20160309.tar.xz/patches/haiku/4010-fix-iconselect-buttons-in-haiku.patch Deleted

@@ -1,35 +0,0 @@
---- a/src/widgets/iconselect.cpp
-+++ b/src/widgets/iconselect.cpp
-@@ -102,6 +102,10 @@ public:
- signals:
- 	void iconSelected(const PsiIcon *);
- 	void textSelected(QString);
-+	
-+public slots:
-+	void aboutToShow() { iconStart(); }
-+	void aboutToHide() { iconStop();  }
- 
- private:
- 	void iconStart()
-@@ -142,8 +146,8 @@ private:
- 		}
- 	}
- 
--	void enterEvent(QEvent *) { iconStart(); setFocus();  update(); } // focus follows mouse mode
--	void leaveEvent(QEvent *) { iconStop(); clearFocus(); update(); }
-+	void enterEvent(QEvent *) { setFocus();   update(); } // focus follows mouse mode
-+	void leaveEvent(QEvent *) { clearFocus(); update(); }
- 
- private slots:
- 	void iconUpdated()
-@@ -333,8 +337,8 @@ void IconSelect::setIconset(const Iconset &iconset)
- 		connect (b, SIGNAL(iconSelected(const PsiIcon *)), menu, SIGNAL(iconSelected(const PsiIcon *)));
- 		connect (b, SIGNAL(textSelected(QString)), menu, SIGNAL(textSelected(QString)));
- 
--		//connect (menu, SIGNAL(aboutToShow()), b, SLOT(aboutToShow()));
--		//connect (menu, SIGNAL(aboutToHide()), b, SLOT(aboutToHide()));
-+		connect (menu, SIGNAL(aboutToShow()), b, SLOT(aboutToShow()));
-+		connect (menu, SIGNAL(aboutToHide()), b, SLOT(aboutToHide()));
- 
- 		if (++column >= size) {
- 			++row;

psi-plus-main-20160309.tar.xz/patches/haiku/4020-fix-screenshotplugin-build-in-haiku.patch Deleted

psi-plus-main-20160309.tar.xz/patches/mac Deleted

psi-plus-main-20160309.tar.xz/patches/mac/3000-brushed-metal.diff Deleted

@@ -1,81 +0,0 @@
---- psi.orig/src/chatdlg.cpp
-+++ psi/src/chatdlg.cpp
-@@ -97,6 +97,11 @@ ChatDlg::ChatDlg(const Jid& jid, PsiAcco
- 	: TabbableWidget(jid, pa, tabManager)
- 	, highlightersInstalled_(false)
- {
-+	if (PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool()) {
-+			setAttribute(Qt::WA_MacMetalStyle);
-+
-+	}
-+
- 	pending_ = 0;
- 	keepOpen_ = false;
- 	warnSend_ = false;
---- psi.orig/src/eventdlg.cpp
-+++ psi/src/eventdlg.cpp
-@@ -458,6 +458,8 @@ void AttachView::addUrlList(const UrlLis
- AddUrlDlg::AddUrlDlg(QWidget *parent)
- :QDialog(parent)
- {
-+	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
-+			setAttribute(Qt::WA_MacMetalStyle);
- 	setupUi(this);
- #ifndef Q_OS_MAC
- 	setWindowIcon(IconsetFactory::icon("psi/www").icon());
-@@ -580,6 +582,8 @@ EventDlg::EventDlg(const QString &to, Ps
- 	: AdvancedWidget<QWidget>(0)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+ 	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
-+			setAttribute(Qt::WA_MacMetalStyle);
- 	d = new Private(this);
- 	d->composing = true;
- 	d->psi = psi;
---- psi.orig/src/infodlg.cpp
-+++ psi/src/infodlg.cpp
-@@ -127,6 +127,8 @@ InfoDlg::InfoDlg(int type, const Jid &j,
- 	: QDialog(parent)
- {
- 	setAttribute(Qt::WA_DeleteOnClose);
-+	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
-+			setAttribute(Qt::WA_MacMetalStyle);
-	setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
-	ui_.setupUi(this);
-	d = new Private;
---- psi.orig/src/psi_profiles.cpp
-+++ psi/src/psi_profiles.cpp
-@@ -896,6 +896,7 @@ bool OptionsMigration::fromFile(const QS
- 				migrateBoolEntry(tag, "jidComplete", "options.ui.message.use-jid-auto-completion");
- 				migrateBoolEntry(tag, "grabUrls", "options.ui.message.auto-grab-urls-from-clipboard");
- 				migrateBoolEntry(tag, "smallChats", "options.ui.chat.use-small-chats");
-+				migrateBoolEntry(tag, "brushedMetal", "options.ui.mac.use-brushed-metal-windows");
- 				migrateBoolEntry(tag, "chatLineEdit", "options.ui.chat.use-expanding-line-edit");
- 				migrateBoolEntry(tag, "useTabs", "options.ui.tabs.use-tabs");
- 				migrateBoolEntry(tag, "putTabsAtBottom", "options.ui.tabs.put-tabs-at-bottom");
---- psi.orig/src/tabs/tabdlg.cpp
-+++ psi/src/tabs/tabdlg.cpp
-@@ -149,6 +149,11 @@ TabDlg::TabDlg(TabManager* tabManager, c
- 		delegate_->create(this);
- 	}
-
-+	if (PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool()) {
-+			setAttribute(Qt::WA_MacMetalStyle);
-+
-+	}
-+
- 	// FIXME
- 	qRegisterMetaType<TabDlg*>("TabDlg*");
- 	qRegisterMetaType<TabbableWidget*>("TabbableWidget*");
---- psi.orig/src/whiteboarding/wbdlg.cpp
-+++ psi/src/whiteboarding/wbdlg.cpp
-@@ -41,6 +41,9 @@ static const QString geometryOption = "o
- //----------------------------------------------------------------------------
-
- WbDlg::WbDlg(SxeSession* session, PsiAccount* pa) {
-+	if ( PsiOptions::instance()->getOption("options.ui.mac.use-brushed-metal-windows").toBool() )
-+		setAttribute(Qt::WA_MacMetalStyle);
-+
- 	groupChat_ = session->groupChat();
- 	pending_ = 0;
- 	keepOpen_ = false;

psi-plus-main-20160309.tar.xz/patches/mac/3020-psi-mac-Makefile.diff Deleted

@@ -1,99 +0,0 @@
-diff -urN src/mac/Makefile work/mac/Makefile
---- src/mac/Makefile	2010-03-30 17:15:28.000000000 +0400
-+++ work/mac/Makefile	2011-01-20 07:17:50.000000000 +0300
-@@ -23,25 +23,25 @@
- SPARKLEDIR=/Library/Frameworks
- PSI_DIR=..
-
--EXECUTABLE_NAME=psi
--NAME=Psi
-+EXECUTABLE_NAME=psi-plus
-+NAME=Psi+
- VOLUME_NAME=$(NAME)
--VERSION=0.15-devel_$(shell date +"%Y%m%d")
--#VERSION=0.15
-+VERSION=0.15.xxx-macosx
-
--APPFILE_NAME=Psi.app
-+APPFILE_NAME=Psi+.app
- FILES=$(APPFILE_NAME)
- DISK_DIR=disk
- ifneq ($(BUILD),no)
- DISK_FILES=$(foreach f,$(FILES), $(addprefix $(DISK_DIR)/,$(f)))
- endif
--MASTER_DMG=$(NAME)-$(VERSION).dmg
-+MASTER_DMG=$(EXECUTABLE_NAME)-$(VERSION).dmg
-
-
- # Other variables
- QT_FRAMEWORK_VERSION=4
--QT_FRAMEWORKS=QtCore QtXml QtNetwork QtGui QtSql QtSvg
-+QT_FRAMEWORKS=QtCore QtXml QtXmlPatterns QtNetwork QtGui QtSql QtSvg QtDBus phonon
- QT_PLUGINS=imageformats/libqjpeg.dylib imageformats/libqgif.dylib
-+PSIPLUS_PLUGINS=`ls ../src/$(EXECUTABLE_NAME).app/Contents/Resources/plugins`
-
- # The rules
- .PHONY: buildall
-@@ -68,7 +68,7 @@
- build-psi:
- 	@echo
- 	@echo --------------------- Building Source Tree --------------------
--	$(MAKE) -C $(PSI_DIR)
-+#	$(MAKE) -C $(PSI_DIR)
- 	@echo
- else
- build-psi:
-@@ -88,7 +88,7 @@
- 	mkdir -p "$@/Contents/Frameworks"
- 	-ditto -rsrc "$(GROWLDIR)/Growl.framework" "$@/Contents/Frameworks/Growl.framework"
- 	-ditto -rsrc "$(SPARKLEDIR)/Sparkle.framework" "$@/Contents/Frameworks/Sparkle.framework"
--	#strip "$@/Contents/MacOS/$(EXECUTABLE_NAME)"
-+	strip "$@/Contents/MacOS/$(EXECUTABLE_NAME)"
- 	#
- 	#@echo
- 	#@echo Installing QCA ...
-@@ -112,7 +112,7 @@
- 	@echo
- 	@echo Installing Qt Frameworks ...
- 	for f in $(QT_FRAMEWORKS); do \
--		ditto -rsrc "$(QTDIR)/lib/$$f.framework" "$@/Contents/Frameworks/$$f.framework"; \
-+		ditto -rsrc "/Library/Frameworks/$$f.framework" "$@/Contents/Frameworks/$$f.framework"; \
- 		rm -rf "$@/Contents/Frameworks/$$f.framework/Headers"; \
- 		rm -rf "$@/Contents/Frameworks/$$f.framework/$$f""_debug"; \
- 		rm -rf "$@/Contents/Frameworks/$$f.framework/$$f""_debug.prl"; \
-@@ -121,15 +121,16 @@
- 		rm -rf "$@/Contents/Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f""_debug.prl"; \
- 		install_name_tool -id "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Frameworks/$$f.framework/$$f"; \
- 		for g in $(QT_FRAMEWORKS); do \
--			install_name_tool -change "$(QTDIR)/lib/$$g.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$g" "@executable_path/../Frameworks/$$g.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$g" "$@/Contents/Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f"; \
-+			install_name_tool -change "$$g.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$g" "@executable_path/../Frameworks/$$g.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$g" "$@/Contents/Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f"; \
- 		done; \
- 		for g in $(QT_PLUGINS); do \
--			install_name_tool -change "$(QTDIR)/lib/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Plugins/$$g"; \
-+			install_name_tool -change "$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Plugins/$$g"; \
- 		done; \
--		\# install_name_tool -change "$(QTDIR)/lib/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Frameworks/libqca.2.dylib"; \
--		\# install_name_tool -change "$(QTDIR)/lib/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Resources/crypto/libqca-openssl.dylib"; \
--		install_name_tool -change "$(QTDIR)/lib/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/MacOS/$(EXECUTABLE_NAME)"; \
--	done
-+		for p in $(PSIPLUS_PLUGINS); do \
-+			install_name_tool -change "$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/Resources/plugins/$$p"; \
-+		done; \
-+		install_name_tool -change "$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "@executable_path/../Frameworks/$$f.framework/Versions/$(QT_FRAMEWORK_VERSION)/$$f" "$@/Contents/MacOS/$(EXECUTABLE_NAME)"; \
-+	done; \
-
- # The rest
- $(DISK_DIR)/%: $(PSI_DIR)/%
-@@ -150,9 +151,9 @@
- $(TEMPLATE_DMG).bz2:
- 	@echo
- 	@echo --------------------- Generating empty template --------------------
--	mkdir template
--	hdiutil create -size 80m "$(TEMPLATE_DMG)" -srcfolder template -format UDRW -volname "$(VOLUME_NAME)" -quiet
--	rmdir template
-+#	mkdir template
-+#	hdiutil create -size 200m "$(TEMPLATE_DMG)" -srcfolder template -format UDRW -volname "$(VOLUME_NAME)" -quiet
-+#	rmdir template
- 	bzip2 "$(TEMPLATE_DMG)"
- 	@echo
-

psi-plus-main-20160309.tar.xz/patches/mac/3030-psi-mac-sparkle.diff Deleted

@@ -1,134 +0,0 @@
---- psi.orig/mac/Info.plist.in
-+++ psi/mac/Info.plist.in
-@@ -7,23 +7,25 @@
- 	<key>CFBundleExecutable</key>
- 	<string>psi</string>
- 	<key>CFBundleGetInfoString</key>
--	<string>Psi @@VERSION@@ by the Psi team. This program is licensed under the GNU GPL.</string>
-+	<string>Psi+ @@VERSION@@ by the Psi+ team. This program is licensed under the GNU GPL.</string>
- 	<key>CFBundleIconFile</key>
- 	<string>application.icns</string>
- 	<key>CFBundleIdentifier</key>
--	<string>org.psi-im</string>
-+	<string>com.googlecode.psi-dev</string>
- 	<key>CFBundleInfoDictionaryVersion</key>
- 	<string>6.0</string>
- 	<key>CFBundleName</key>
--	<string>Psi</string>
-+	<string>Psi+</string>
- 	<key>CFBundlePackageType</key>
- 	<string>APPL</string>
- 	<key>CFBundleShortVersionString</key>
--	<string>Psi @@VERSION@@</string>
-+	<string>Psi+ @@VERSION@@</string>
- 	<key>CFBundleSignature</key>
- 	<string>psi</string>
- 	<key>CFBundleVersion</key>
- 	<string>@@VERSION@@</string>
-+	<key>SUPublicDSAKeyFile</key>
-+	<string>dsa_pub.pem</string>
- 	<key>CSResourcesFileMapped</key>
- 	<true/>
- </dict>
---- psi.orig/src/applicationinfo.cpp
-+++ psi/src/applicationinfo.cpp
-@@ -36,7 +36,7 @@
- #define PROG_STORAGE_NS "http://psi-im.org/storage"
- #define PROG_FILECACHE_NS "http://psi-im.org/filecache"
- #ifdef Q_OS_MAC
--#define PROG_APPCAST_URL "http://psi-im.org/appcast/psi-mac.xml"
-+#define PROG_APPCAST_URL "http://psi-dev.googlecode.com/files/psi-plus-mac.xml"
- #else
- #define PROG_APPCAST_URL ""
- #endif
---- psi.orig/src/mainwin.cpp
-+++ psi/src/mainwin.cpp
-@@ -89,6 +89,11 @@
- #include <x11windowsystem.h>
- #endif
-
-+#include "AutoUpdater/AutoUpdater.h"
-+#ifdef HAVE_SPARKLE
-+#include "AutoUpdater/SparkleAutoUpdater.h"
-+#endif
-+
- using namespace XMPP;
-
- static const QString showStatusMessagesOptionPath = "options.ui.contactlist.status-messages.show";
-@@ -536,6 +541,9 @@ MainWin::MainWin(bool _onTop, bool _asTo
- 	d->getAction("help_online_home")->addTo (helpMenu);
- 	d->getAction("help_online_forum")->addTo (helpMenu);
- 	d->getAction("help_psi_muc")->addTo (helpMenu);
-+#ifdef HAVE_SPARKLE
-+	d->getAction("help_update")->addTo (helpMenu);
-+#endif
- 	d->getAction("help_report_bug")->addTo (helpMenu);
- 	QMenu* diagMenu = new QMenu(tr("Diagnostics"), this);
- 	helpMenu->addMenu(diagMenu);
-@@ -718,6 +724,9 @@ void MainWin::registerAction( IconAction
- 		{ "help_online_home", activated, this, SLOT( actOnlineHomeActivated() ) },
- 		{ "help_online_forum", activated, this, SLOT( actOnlineForumActivated() ) },
- 		{ "help_psi_muc",     activated, this, SLOT( actJoinPsiMUCActivated() ) },
-+#ifdef HAVE_SPARKLE
-+		{ "help_update",     activated, this, SLOT( actCheckUpdateActivated() ) },
-+#endif
- 		{ "help_report_bug",  activated, this, SLOT( actBugReportActivated() ) },
- 		{ "help_about",       activated, this, SLOT( actAboutActivated() ) },
- 		{ "help_about_qt",    activated, this, SLOT( actAboutQtActivated() ) },
-@@ -972,6 +979,9 @@ void MainWin::buildOptionsMenu()
- 			<< "help_report_bug"
- 			<< "diagnostics"
- 			<< "separator"
-+#ifdef HAVE_SPARKLE
-+			<< "help_update"
-+#endif
- 			<< "help_about"
- 			<< "help_about_qt";
-
-@@ -1097,6 +1105,16 @@ void MainWin::actAboutQtActivated ()
- 	QMessageBox::aboutQt(this);
- }
-
-+void MainWin::actCheckUpdateActivated()
-+{
-+#ifdef HAVE_SPARKLE
-+	AutoUpdater* autoUpdater;
-+	autoUpdater = new SparkleAutoUpdater(ApplicationInfo::getAppCastURL());
-+	autoUpdater->checkForUpdates();
-+	delete autoUpdater;
-+#endif
-+}
-+
- void MainWin::actAboutPsiMediaActivated ()
- {
- 	QString creditText = PsiMedia::creditText();
---- psi.orig/src/mainwin.h
-+++ psi/src/mainwin.h
-@@ -133,6 +133,7 @@ private slots:
- 	void actOnlineHomeActivated ();
- 	void actOnlineForumActivated ();
- 	void actJoinPsiMUCActivated();
-+	void actCheckUpdateActivated();
- 	void actBugReportActivated ();
- 	void actAboutActivated ();
- 	void actAboutQtActivated ();
---- psi.orig/src/psiactionlist.cpp
-+++ psi/src/psiactionlist.cpp
-@@ -387,6 +387,9 @@ void PsiActionList::Private::createMainW
- 		IconAction *actPsiMUC = new IconAction (tr("Join Psi Discussion Room (Online)"), tr("&Join Psi Discussion Room (Online)"), 0, this);
- 		actOnlineHome->setWhatsThis (tr("Join Psi Discussion Room (Online)"));
-
-+		IconAction *actCheckUpdate = new IconAction (tr("Check for Updates..."), tr("&Check for Updates..."), 0, this);
-+		actCheckUpdate->setWhatsThis (tr("Check for Updates..."));
-+
- 		IconAction *actBugReport = new IconAction (tr("Report a Bug (Online)"), tr("Report a &Bug (Online)"), 0, this);
- 		actBugReport->setWhatsThis (tr("Report a Bug (Online)"));
-
-@@ -415,6 +418,7 @@ void PsiActionList::Private::createMainW
- 			{ "help_report_bug",       actBugReport       },
- 			{ "help_about",            actAbout           },
- 			{ "help_about_qt",         actAboutQt         },
-+			{ "help_update",           actCheckUpdate     },
- 			{ "help_about_psimedia",   actAboutPsiMedia   },
- 			{ "help_diag_qcaplugin",   actDiagQCAPlugin   },
- 			{ "help_diag_qcakeystore", actDiagQCAKeyStore },

psi-plus-main-20160309.tar.xz/patches/mac/3040-psi-chat-theme-mac_native.diff Deleted

@@ -1,144 +0,0 @@
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Info.plist
-@@ -0,0 +1,36 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-+<plist version="1.0">
-+<dict>
-+	<key>AllowTextColors</key>
-+	<false/>
-+	<key>CFBundleDevelopmentRegion</key>
-+	<string>English</string>
-+	<key>CFBundleGetInfoString</key>
-+	<string>Native Mac Message Style</string>
-+	<key>CFBundleIdentifier</key>
-+	<string>nativemac.style</string>
-+	<key>CFBundleInfoDictionaryVersion</key>
-+	<string>1.2</string>
-+	<key>CFBundleName</key>
-+	<string>Native Mac</string>
-+	<key>CFBundlePackageType</key>
-+	<string>AdIM</string>
-+	<key>DefaultBackgroundColor</key>
-+	<string>ffffff</string>
-+	<key>DefaultFontFamily</key>
-+	<string>Helvetica</string>
-+	<key>DefaultFontSize</key>
-+	<integer>9</integer>
-+	<key>MessageViewVersion</key>
-+	<real>1.1</real>
-+	<key>DisableCustomBackground</key>
-+	<true/>
-+	<key>DefaultVariant</key>
-+	<string>Normal</string>
-+	<key>DisableCombineConsecutive</key>
-+	<true/>
-+	<key>ShowsUserIcons</key>
-+	<true/>
-+</dict>
-+</plist>
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Main.css
-@@ -0,0 +1,53 @@
-+body {
-+  background-color: #fff;
-+  margin: 0;
-+  padding: 0;
-+  font-family: 'helvetica neue', helvetica, arial, sans-serif;
-+  font-size: 14px;
-+  text-align: left;
-+}
-+
-+/* Heading */
-+div.heading {
-+  position: fixed;
-+  top: 0;
-+  right: 0;
-+  padding: 1.25em 0;
-+  width: 100%;
-+  z-index: 999;
-+  color: #fff;
-+  border-bottom: 1px solid #666;
-+  background: #777;
-+  text-shadow: #333 0.1em 0.1em 0.1em
-+}
-+div.heading .icon { position: absolute; top: 1px; left: 1px; border: 1px solid #333; background: #fff; }
-+div.heading img.icon { height: 66px; width: 66px; }
-+div.heading .with, div.heading .timestamp {
-+  font-weight: bold;
-+  font-family: 'myriadd pro', 'myriad', 'lucida grande', 'trebuchet ms', arial, sans-serif;
-+  position: relative;
-+  left: 4.5em;
-+}
-+div.heading .with { font-size: 20px; }
-+div.heading .timestamp { font-size: 13px; margin: 0 0 0 2.5em; }
-+
-+/* Main message style */
-+dl, dt, dd { margin: 0; display: hidden; }
-+dl { border-top: 1px solid #ccc; padding: .7em .8em; }
-+dt, dd { display: inline; }
-+dt.nickname, dd.timestamp { font-weight: bold; }
-+dt.nickname { color: #333; background: none; }
-+dd.msg { color: #555; font-family: helvetica, arial, sans-serif; }
-+dd.timestamp { float: right; color: #555 }
-+dl.item.notice { font-style: italic; text-align: center; }
-+dl.item.mine { background: #f5f5f5; }
-+
-+
-+/* Links */
-+a:link { color: #c9a874; text-decoration: none; outline: 0 none; }
-+a:hover { color: #c6903a; border-bottom: 1px dotted #c6903a; }
-+
-+@media screen {
-+  a:visited, .visited { padding: 4px 0px 0 20px; background-color: transparent; background-repeat: no-repeat; background-position: 0px center; }
-+  a:visited, .visited { background-image: url('../img/tick.png'); }
-+}
-\ No newline at end of file
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Status.html
-@@ -0,0 +1,5 @@
-+<dl class="item notice">
-+  <dd class="timestamp">%time%</dd>
-+  <dd class="msg">%message%</dd>
-+</dl>
-+<div id="insert"></div>
-\ No newline at end of file
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Incoming/Content.html
-@@ -0,0 +1,6 @@
-+<dl class="item">
-+  <dd class="timestamp">%time%</dd>
-+  <dt class="nickname">%sender% &nbsp;&raquo;</dt>
-+  <dd class="msg">&nbsp;%message%</dd>
-+</dl>
-+<div id="insert"></div>
-\ No newline at end of file
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Incoming/Context.html
-@@ -0,0 +1,6 @@
-+<dl class="item">
-+  <dd class="timestamp">%time%</dd>
-+  <dt class="nickname">%sender% &nbsp;&raquo;</dt>
-+  <dd class="msg">&nbsp;%message%</dd>
-+</dl>
-+<div id="insert"></div>
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Outgoing/Content.html
-@@ -0,0 +1,6 @@
-+<dl class="item mine">
-+  <dd class="timestamp">%time%</dd>
-+  <dt class="nickname">%sender% &nbsp;&raquo;</dt>
-+  <dd class="msg">&nbsp;%message%</dd>
-+</dl>
-+<div id="insert"></div>
-\ No newline at end of file
---- /dev/null
-+++ psi/themes/chatview/adium/native_mac/Contents/Resources/Outgoing/Context.html
-@@ -0,0 +1,6 @@
-+<dl class="item mine">
-+  <dd class="timestamp">%time%</dd>
-+  <dt class="nickname">%sender% &nbsp;&raquo;</dt>
-+  <dd class="msg">&nbsp;%message%</dd>
-+</dl>
-+<div id="insert"></div>
-\ No newline at end of file

psi-plus-main-20160309.tar.xz/patches/mac/fix-cocoa-tray-click.diff Deleted

@@ -1,182 +0,0 @@
-diff -urpN git.orig/src/CocoaUtilities/CocoaTrayClick.cpp git/src/CocoaUtilities/CocoaTrayClick.cpp
---- git.orig/src/CocoaUtilities/CocoaTrayClick.cpp	1970-01-01 03:00:00.000000000 +0300
-+++ git/src/CocoaUtilities/CocoaTrayClick.cpp	2015-05-04 11:30:57.000000000 +0400
-@@ -0,0 +1,91 @@
-+/*
-+ * CocoaTrayClick
-+ * Copyright (C) 2012, 2015  Khryukin Evgeny
-+ *
-+ * 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 2
-+ * 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 library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "CocoaTrayClick.h"
-+#include <objc/runtime.h>
-+#include <objc/message.h>
-+#include <QApplication>
-+
-+#ifdef DEBUG_OUTPUT
-+#include <QDebug>
-+#endif
-+
-+bool dockClickHandler(id /*self*/, SEL /*_cmd*/, ...)
-+{
-+	CocoaTrayClick::instance()->emitTrayClicked();
-+	return true;
-+}
-+
-+
-+CocoaTrayClick * CocoaTrayClick::instance()
-+{
-+	if(!instance_)
-+		instance_ = new CocoaTrayClick();
-+
-+	return instance_;
-+}
-+
-+CocoaTrayClick::CocoaTrayClick()
-+	: QObject(qApp)
-+{
-+	Class cls = objc_getClass("NSApplication");
-+	objc_object *appInst = objc_msgSend((objc_object*)cls, sel_registerName("sharedApplication"));
-+
-+	if(appInst != NULL) {
-+		objc_object* delegate = objc_msgSend(appInst, sel_registerName("delegate"));
-+		Class delClass = (Class)objc_msgSend(delegate,  sel_registerName("class"));
-+		SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
-+		if (class_getInstanceMethod(delClass, shouldHandle)) {
-+			if (class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:")) {
-+#ifdef DEBUG_OUTPUT
-+				qDebug() << "Registered dock click handler (replaced original method)";
-+#endif
-+			}
-+			else {
-+#ifdef DEBUG_OUTPUT
-+				qDebug() << "Failed to replace method for dock click handler";
-+#endif
-+			}
-+		}
-+		else {
-+			if (class_addMethod(delClass, shouldHandle, (IMP)dockClickHandler,"B@:")) {
-+#ifdef DEBUG_OUTPUT
-+				qDebug() << "Registered dock click handler";
-+#endif
-+			}
-+			else {
-+#ifdef DEBUG_OUTPUT
-+				qDebug() << "Failed to register dock click handler";
-+#endif
-+			}
-+		}
-+	}
-+}
-+
-+CocoaTrayClick::~CocoaTrayClick()
-+{
-+}
-+
-+void CocoaTrayClick::emitTrayClicked()
-+{
-+	emit trayClicked();
-+}
-+
-+CocoaTrayClick* CocoaTrayClick::instance_ = NULL;
-diff -urpN git.orig/src/CocoaUtilities/CocoaTrayClick.mm git/src/CocoaUtilities/CocoaTrayClick.mm
---- git.orig/src/CocoaUtilities/CocoaTrayClick.mm	2014-07-29 14:24:36.000000000 +0400
-+++ git/src/CocoaUtilities/CocoaTrayClick.mm	1970-01-01 03:00:00.000000000 +0300
-@@ -1,60 +0,0 @@
--/*
-- * CocoaTrayClick
-- * Copyright (C) 2012  Khryukin Evgeny
-- *
-- * 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 2
-- * 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 library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-- *
-- */
--
--#include "CocoaUtilities/CocoaTrayClick.h"
--#include <objc/runtime.h>
--#include <QApplication>
--#include <QDebug>
--#ifdef HAVE_QT5
--#include <AppKit/NSApplication.h>
--#endif
--
--void dockClickHandler(id /*self*/, SEL /*_cmd*/)
--{
--	CocoaTrayClick::instance()->emitTrayClicked();
--}
--
--
--CocoaTrayClick * CocoaTrayClick::instance()
--{
--	if(!instance_)
--		instance_ = new CocoaTrayClick();
--
--	return instance_;
--}
--
--CocoaTrayClick::CocoaTrayClick()
--	: QObject(qApp)
--{
--	Class cls = [[[NSApplication sharedApplication] delegate] class];
--	if (!class_addMethod(cls, @selector(applicationShouldHandleReopen:hasVisibleWindows:), (IMP) dockClickHandler, "v@:"))
--		qDebug() << "CocoaTrayClick::Private : class_addMethod failed!";
--}
--
--CocoaTrayClick::~CocoaTrayClick()
--{
--}
--
--void CocoaTrayClick::emitTrayClicked()
--{
--	emit trayClicked();
--}
--
--CocoaTrayClick* CocoaTrayClick::instance_ = NULL;
-diff -urpN git.orig/src/CocoaUtilities/CocoaUtilities.pri git/src/CocoaUtilities/CocoaUtilities.pri
---- git.orig/src/CocoaUtilities/CocoaUtilities.pri	2014-07-29 14:24:36.000000000 +0400
-+++ git/src/CocoaUtilities/CocoaUtilities.pri	2015-05-04 12:48:32.000000000 +0400
-@@ -8,5 +8,6 @@ HEADERS += \
- 
- OBJECTIVE_SOURCES += \
- 	$$PWD/CocoaInitializer.mm \
--	$$PWD/cocoacommon.mm \
--	$$PWD/CocoaTrayClick.mm
-+	$$PWD/cocoacommon.mm
-+
-+SOURCES += $$PWD/CocoaTrayClick.cpp
-diff -urpN git.orig/src/src.pri git/src/src.pri
---- git.orig/src/src.pri	2015-05-04 12:46:00.000000000 +0400
-+++ git/src/src.pri	2015-05-04 12:57:43.000000000 +0400
-@@ -632,6 +632,7 @@ else {
- 
- mac {
- 	QMAKE_LFLAGS += -framework Carbon -framework IOKit -framework AppKit
-+	QMAKE_LFLAGS += -framework CoreFoundation -lobjc #for cocoatrayclick
- }
- 
- INCLUDEPATH += $$PWD

psi-plus-main-20160309.tar.xz/patches/psimedia Deleted

psi-plus-main-20160309.tar.xz/patches/psimedia/0010-psimedia-varrate-asterisk.diff Deleted

@@ -1,131 +0,0 @@
-diff -ru psimedia-1.0.3/gstprovider/modes.cpp psimedia-1.0.3-hacked/gstprovider/modes.cpp
---- psimedia-1.0.3/gstprovider/modes.cpp	2009-03-04 22:26:59.000000000 +0100
-+++ psimedia-1.0.3-hacked/gstprovider/modes.cpp	2010-03-05 00:42:20.000000000 +0100
-@@ -67,7 +67,7 @@
- 		p.sampleSize = 16;
- 		p.channels = 1;
- 		list += p;
--	}
-+	}*/
- 	{
- 		PAudioParams p;
- 		p.codec = "speex";
-@@ -75,7 +75,7 @@
- 		p.sampleSize = 16;
- 		p.channels = 1;
- 		list += p;
--	}*/
-+	}
- 	{
- 		PAudioParams p;
- 		p.codec = "speex";
-diff -ru psimedia-1.0.3/gstprovider/rtpworker.cpp psimedia-1.0.3-hacked/gstprovider/rtpworker.cpp
---- psimedia-1.0.3/gstprovider/rtpworker.cpp	2009-05-17 20:32:59.000000000 +0200
-+++ psimedia-1.0.3-hacked/gstprovider/rtpworker.cpp	2010-03-05 00:50:59.000000000 +0100
-@@ -969,6 +969,11 @@
-
- bool RtpWorker::startSend()
- {
-+  return startSend(16000);
-+}
-+
-+bool RtpWorker::startSend(int rate)
-+{
- 	// file source
- 	if(!infile.isEmpty() || !indata.isEmpty())
- 	{
-@@ -1055,7 +1060,7 @@
-
- 	if(audiosrc)
- 	{
--		if(!addAudioChain())
-+		if(!addAudioChain(rate))
- 		{
- 			delete pd_audiosrc;
- 			pd_audiosrc = 0;
-@@ -1192,15 +1197,22 @@
-
- 	// TODO: support more than speex
- 	int speex_at = -1;
-+	int samplerate = -1;
- 	for(int n = 0; n < remoteAudioPayloadInfo.count(); ++n)
- 	{
- 		const PPayloadInfo &ri = remoteAudioPayloadInfo[n];
--		if(ri.name.toUpper() == "SPEEX" && ri.clockrate == 16000)
-+		if(ri.name.toUpper() == "SPEEX")
- 		{
--			speex_at = n;
--			break;
-+			if (ri.clockrate > samplerate) {
-+			  speex_at = n;
-+			  samplerate = ri.clockrate;
-+			}
- 		}
- 	}
-+	if (samplerate != 16000) {
-+	  cleanup();
-+	  startSend(samplerate);
-+	}
-
- 	// TODO: support more than theora
- 	int theora_at = -1;
-@@ -1460,9 +1472,13 @@
-
- bool RtpWorker::addAudioChain()
- {
-+  return addAudioChain(16000);
-+}
-+
-+bool RtpWorker::addAudioChain(int rate)
-+{
- 	// TODO: support other codecs.  for now, we only support speex 16khz
- 	QString codec = "speex";
--	int rate = 16000;
- 	int size = 16;
- 	int channels = 1;
- 	//QString codec = localAudioParams[0].codec;
-@@ -1478,7 +1494,7 @@
- 	for(int n = 0; n < remoteAudioPayloadInfo.count(); ++n)
- 	{
- 		const PPayloadInfo &ri = remoteAudioPayloadInfo[n];
--		if(ri.name.toUpper() == "SPEEX" && ri.clockrate == 16000)
-+		if(ri.name.toUpper() == "SPEEX" && ri.clockrate == rate)
- 		{
- 			pt = ri.id;
- 			break;
-@@ -1683,7 +1699,20 @@
-
- 		gst_caps_unref(caps);
-
--		localAudioPayloadInfo = QList<PPayloadInfo>() << pi;
-+		PPayloadInfo speexnb;
-+		speexnb.id = 97;
-+		speexnb.name = "SPEEX";
-+		speexnb.clockrate = 8000;
-+		speexnb.channels = 1;
-+		speexnb.ptime = pi.ptime;
-+		speexnb.maxptime = pi.maxptime;
-+
-+		QList<PPayloadInfo> ppil;
-+		ppil << pi;
-+		ppil << speexnb;
-+
-+
-+		localAudioPayloadInfo = ppil;
- 		canTransmitAudio = true;
- 	}
-
-diff -ru psimedia-1.0.3/gstprovider/rtpworker.h psimedia-1.0.3-hacked/gstprovider/rtpworker.h
---- psimedia-1.0.3/gstprovider/rtpworker.h	2009-03-13 20:46:42.000000000 +0100
-+++ psimedia-1.0.3-hacked/gstprovider/rtpworker.h	2010-03-05 00:50:37.000000000 +0100
-@@ -177,8 +177,10 @@
-
- 	bool setupSendRecv();
- 	bool startSend();
-+	bool startSend(int rate);
- 	bool startRecv();
- 	bool addAudioChain();
-+	bool addAudioChain(int rate);
- 	bool addVideoChain();
- 	bool getCaps();
- 	bool updateTheoraConfig();

psi-plus-main-20160309.tar.xz/patches/psimedia/0020-psimedia-win32-compilation-paths.diff Deleted

@@ -1,60 +0,0 @@
-Index: psimedia/gstprovider/gstconf.pri
-===================================================================
---- psimedia/gstprovider/gstconf.pri	(revision 783)
-+++ psimedia/gstprovider/gstconf.pri	(working copy)
-@@ -5,29 +5,37 @@
-
- windows {
- 	INCLUDEPATH += \
--		c:/mingw/include/glib-2.0 \
--		c:/mingw/lib/glib-2.0/include \
--		c:/msys/1.0/home/gst/include \
--		c:/msys/1.0/home/gst/include/liboil-0.3 \
--		c:/msys/1.0/home/gst/include/gstreamer-0.10
-+		c:/glib/include/glib-2.0 \
-+		c:/glib/lib/glib-2.0/include \
-+		c:/gstforwin/dxsdk/include \
-+		c:/gstforwin/winsdk/include \
-+		c:/gstforwin/include \
-+		c:/gstforwin/include/liboil-0.3 \
-+		c:/gstforwin/include/libxml2 \
-+		c:/gstforwin/gstreamer/include/gstreamer-0.10 \
-+		c:/gstforwin/gst-plugins-base/include/gstreamer-0.10
- 	LIBS += \
--		-Lc:/msys/1.0/home/gst/lib \
--		-lgstreamer-0.10.dll \
--		-lgthread-2.0 \
--		-lglib-2.0 \
--		-lgobject-2.0 \
--		-lgstvideo-0.10.dll \
--		-lgstbase-0.10.dll \
--		-lgstinterfaces-0.10.dll
-+		-Lc:/glib/bin \
-+		-Lc:/gstforwin/bin \
-+		-Lc:/gstforwin/gstreamer/bin \
-+		-Lc:/gstforwin/gst-plugins-base/bin \
-+		-lgstreamer-0.10-0 \
-+		-lgthread-2.0-0 \
-+		-lglib-2.0-0 \
-+		-lgobject-2.0-0 \
-+		-lgstvideo-0.10-0 \
-+		-lgstbase-0.10-0 \
-+		-lgstinterfaces-0.10-0
-
- 	# qmake mingw seems to have broken prl support, so force these
- 	win32-g++|contains($$list($$[QT_VERSION]), 4.0.*|4.1.*|4.2.*|4.3.*) {
- 		LIBS *= \
--			-loil-0.3 \
--			-lgstaudio-0.10.dll \
--			-lgstrtp-0.10.dll \
--			-lgstnetbuffer-0.10.dll \
--			-lspeexdsp.dll \
-+			-Lc:/gstforwin/winsdk/lib \
-+			-loil-0.3-0 \
-+			-lgstaudio-0.10-0 \
-+			-lgstrtp-0.10-0 \
-+			-lgstnetbuffer-0.10-0 \
-+			-lspeexdsp-1 \
- 			-lsetupapi \
- 			-lksuser \
- 			-lamstrmid \

psi-plus-main-20160309.tar.xz/patches/psimedia/0030-psimedia-uvcvideo-fix.diff Deleted

@@ -1,41 +0,0 @@
-Index: psimedia/gstprovider/pipeline.cpp
-===================================================================
---- psimedia/gstprovider/pipeline.cpp	(revision 791)
-+++ psimedia/gstprovider/pipeline.cpp	(working copy)
-@@ -156,20 +156,23 @@
- 	GstElement *capsfilter = gst_element_factory_make("capsfilter", NULL);
- 	GstCaps *caps = gst_caps_new_empty();
-
--	for(int n = 0; n < widths.count(); ++n)
--	{
--		GstStructure *cs;
--		cs = gst_structure_new("video/x-raw-yuv",
--			"width", GST_TYPE_INT_RANGE, 1, widths[n],
--			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
--		gst_caps_append_structure(caps, cs);
-+// 	for(int n = 0; n < widths.count(); ++n)
-+// 	{
-+// 		GstStructure *cs;
-+// 		cs = gst_structure_new("video/x-raw-yuv",
-+// 			"width", GST_TYPE_INT_RANGE, 1, widths[n],
-+// 			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
-+// 		gst_caps_append_structure(caps, cs);
-+//
-+// 		cs = gst_structure_new("video/x-raw-rgb",
-+// 			"width", GST_TYPE_INT_RANGE, 1, widths[n],
-+// 			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
-+// 		gst_caps_append_structure(caps, cs);
-+// 	}
-+        caps = gst_caps_from_string("video/x-raw-yuv , width=[320] , "
-+			"height=[240] , framerate=[30/1]");
-+        g_object_set(G_OBJECT(capsfilter), "caps", caps, NULL);
-
--		cs = gst_structure_new("video/x-raw-rgb",
--			"width", GST_TYPE_INT_RANGE, 1, widths[n],
--			"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
--		gst_caps_append_structure(caps, cs);
--	}
--
- 	GstStructure *cs = gst_structure_new("image/jpeg", NULL);
- 	gst_caps_append_structure(caps, cs);
-

psi-plus-main-20160309.tar.xz/patches/psimedia/0040-psimedia-2.6.38-compilation-fix.diff Deleted

@@ -1,100 +0,0 @@
-Index: psimedia/gstprovider/deviceenum/deviceenum_unix.cpp
-===================================================================
---- psimedia/gstprovider/deviceenum/deviceenum_unix.cpp	(revision 808)
-+++ psimedia/gstprovider/deviceenum/deviceenum_unix.cpp	(working copy)
-@@ -35,7 +35,7 @@
- # include <sys/stat.h>
- # include <dirent.h>
- # include <sys/ioctl.h>
--# include <linux/videodev.h>
-+# include <linux/videodev2.h>
- #endif
-
- namespace DeviceEnum {
-@@ -475,77 +475,6 @@
- 	return out;
- }
-
--// v4l detection scheme adapted from PWLib (used by Ekiga/Gnomemeeting)
--static QList<Item> get_v4l_items()
--{
--#ifdef Q_OS_LINUX
--	QList<Item> out;
--
--	QList<V4LName> list = get_v4l_names("/sys/class/video4linux", true);
--	if(list.isEmpty())
--		list = get_v4l_names("/proc/video/dev", false);
--
--	// if we can't find anything, then do a raw scan for possibilities
--	if(list.isEmpty())
--	{
--		QStringList possible = scan_for_videodevs("/dev");
--		foreach(QString str, possible)
--		{
--			V4LName v;
--			v.dev = str;
--			list += v;
--		}
--	}
--
--	for(int n = 0; n < list.count(); ++n)
--	{
--		V4LName &v = list[n];
--
--		// if we already have a friendly name then we'll skip the confirm
--		//   in order to save resources.  the only real drawback here that
--		//   I can think of is if the device isn't a capture type.  but
--		//   what does it mean to have a V4L device that isn't capture??
--		if(v.friendlyName.isEmpty())
--		{
--			int fd = open(QFile::encodeName(v.dev).data(), O_RDONLY | O_NONBLOCK);
--			if(fd == -1)
--				continue;
--
--			// get video capabilities and close
--			struct video_capability caps;
--			memset(&caps, 0, sizeof(caps));
--			int ret = ioctl(fd, VIDIOCGCAP, &caps);
--			close(fd);
--			if(ret == -1)
--				continue;
--
--			if(!(caps.type & VID_TYPE_CAPTURE))
--				continue;
--
--			v.friendlyName = caps.name;
--		}
--
--		Item i;
--		i.type = Item::Video;
--		i.dir = Item::Input;
--		i.name = v.friendlyName;
--		i.driver = "v4l";
--		i.id = v.dev;
--
--		// HACK
--		if(v.friendlyName == "Labtec Webcam Notebook")
--			i.explicitCaptureSize = QSize(640, 480);
--
--		out += i;
--	}
--
--	return out;
--#else
--	// return empty list if non-linux
--	return QList<Item>();
--#endif
--}
--
- static QList<Item> get_v4l2_items()
- {
- #ifdef Q_OS_LINUX
-@@ -636,8 +565,6 @@
- 	QList<Item> out;
- 	if(driver.isEmpty() || driver == "v4l2")
- 		out += get_v4l2_items();
--	if(driver.isEmpty() || driver == "v4l")
--		out += get_v4l_items();
- 	return out;
- }
-

psi-plus-main-20160309.tar.xz/patches/psimedia/0050-psimedia-drop-v4lsrc-gst-plugin.diff Deleted

@@ -1,51 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=361419#c5
-
---- psimedia/gstprovider/devices.cpp	2009-06-09 10:12:11.000000000 +0200
-+++ psimedia/gstprovider/devices.cpp	2011-04-02 11:47:21.898041830 +0200
-@@ -90,7 +90,6 @@
- 		element_name == "alsasink" ||
- 		element_name == "osssrc" ||
- 		element_name == "osssink" ||
--		element_name == "v4lsrc" ||
- 		element_name == "v4l2src" ||
- 		element_name == "osxaudiosrc" ||
- 		element_name == "osxaudiosink" ||
-@@ -224,11 +223,6 @@
- 		if(type == PDevice::VideoIn)
- 			element_name = "osxvideosrc";
- 	}
--	else if(driver == "v4l")
--	{
--		if(type == PDevice::VideoIn)
--			element_name = "v4lsrc";
--	}
- 	else if(driver == "v4l2")
- 	{
- 		if(type == PDevice::VideoIn)
-@@ -380,7 +374,7 @@
- 			bool first = true;
- 			foreach(const DeviceEnum::Item &i, list)
- 			{
--				if(type == PDevice::VideoIn && (element_name == "v4lsrc" || element_name == "v4l2src"))
-+				if(type == PDevice::VideoIn && element_name == "v4l2src")
- 				{
- 					if(!test_video(element_name, i.id))
- 						continue;
-@@ -444,7 +438,6 @@
- 	else // PDevice::VideoIn
- 	{
- 		drivers
--		<< "v4l"
- 		<< "v4l2"
- 		<< "osxvideo"
- 		<< "winks";
---- psimedia/gstprovider/gstthread.cpp	2009-05-17 19:55:27.000000000 +0200
-+++ psimedia/gstprovider/gstthread.cpp	2011-04-02 11:48:28.581514484 +0200
-@@ -235,7 +235,6 @@
- #elif defined(Q_OS_LINUX)
- 			reqelem
- 			<< "alsasrc" << "alsasink"
--			<< "v4lsrc"
- 			<< "v4l2src";
- #elif defined(Q_OS_UNIX)
- 			reqelem

psi-plus-main-20160309.tar.xz/version.txt Deleted

psi-plus-resources-1.tar.xz/iconsets/emoticons/Emojis.jisp Changed

psi-plus-resources-1.tar.xz/skins Deleted

psi-plus-resources-1.tar.xz/skins/default_skin.png Deleted

psi-plus-resources-1.tar.xz/skins/default_skin.skn Deleted

@@ -1,208 +0,0 @@
-<skin version="0.5" author="tux-den" name="Default skin">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#f0f0f0</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#5a5a5a</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#969696</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#ff0000</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#910000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#00008a</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#336600</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">24</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">false</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString"></options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>button_options</item>
-            <item>button_status</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{3688b1b9-77a0-4c52-a45b-06721939e2b1}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Кнопки</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>view_groups</item>
-            <item>menu_add_contact</item>
-            <item>menu_disco</item>
-            <item>menu_options</item>
-            <item>menu_play_sounds</item>
-            <item>menu_xml_console</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{2c44307f-91b3-45ef-aee6-c1b6b910c6f9}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{d4154360-373b-40e4-b1b0-d789a20c098f}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">true</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAJYAAAEfAAAABAAAAAQAAAAIAAAACPwAAAADAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewAyAGMANAA0ADMAMAA3AGYALQA5ADEAYgAzAC0ANAA1AGUAZgAtAGEAZQBlADYALQBjADEAYgA2AGIAOQAxADAAYwA2AGYAOQB9AQAAAAD/////AAAAAAAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADMANgA4ADgAYgAxAGIAOQAtADcANwBhADAALQA0AGMANQAyAC0AYQA0ADUAYgAtADAANgA3ADIAMQA5ADMAOQBlADIAYgAxAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAZAA0ADEANQA0ADMANgAwAC0AMwA3ADMAYgAtADQAMABlADQALQBiADEAYgAwAC0AZAA3ADgAOQBhADIAMABjADAAOQA4AGYAfQEAAAAA/////wAAAAAAAAAA</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">psiplus-activities-16.jisp</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">default</options.iconsets.status>
-        <options.iconsets.system type="QString">default</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">32</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">/* frame of avatar - general settings */
-/* фрейм с аватаром - общие настройки */
-RosterAvatarFrame * {
-	margin: 1px;
-}
-
-/* frame of avatar - avatar */
-/* фрейм с аватаром - аватар */
-QLabel#lb_avatar {
-	margin-left: 0px;
-	margin-top: 2px;
-	margin-bottom: 2px;
-	border: 1px solid #949494;
-	border-radius: 3px;
-}
-
-/* frame of avatar - nick */
-/* фрейм с аватаром - ник */
-QLabel#lb_nick {
-	margin: 2px;
-	margin-right: 1px;
-	margin-bottom: 3px;
-	border: 1px solid #949494;
-	border-radius: 3px;
-}
-
-/* frame of avatar - buttons of PEP and status */
-/* фрейм с аватаром - кнопки PEP и статуса */
-QToolButton#tb_status, #tb_mood, #tb_activity {
-	margin-left: 1px;
-	margin-right: 1px;
-	margin-bottom: 2px;
-	width: 100%;
-}
-
-QToolButton#tb_status {
-	margin-top: 0px;
-	margin-bottom: 1px;
-}
-
-/* frame of avatar - button of status, arrow */
-/* фрейм с аватаром - кнопка статуса, стрелка */
-QToolButton#tb_status::menu-indicator {
-	background: argb(0,0,0,0);
-}
-
-/* frame of avatar - field of status message */
-/* фрейм с аватаром - строка статусного сообщения */
-QLineEdit#le_status_text {
-	margin-right: 0px;
-	margin-bottom: 2px;
-}</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">true</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">true</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">true</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">true</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">true</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">true</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">false</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">true</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString"></options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">true</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type=""></options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type=""></options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">true</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">true</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString"></options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">false</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">true</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>Blue</item>
-            <item>Green</item>
-            <item>Orange</item>
-            <item>Purple</item>
-            <item>Red</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">false</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">52</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">0</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">medals-affiliations.jisp</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">psi/classic</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>

psi-plus-resources-1.tar.xz/skins/mac Deleted

psi-plus-resources-1.tar.xz/skins/mac/brushed_metal Deleted

psi-plus-resources-1.tar.xz/skins/mac/brushed_metal/brush.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/brushed_metal/brushed_metal.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/brushed_metal/brushed_metal.skn Deleted

@@ -1,314 +0,0 @@
-<skin version="0.2.2" author="tux-den" name="Brushed Metal" path="/Applications/Psi+.app/Contents/Resources/skins/mac/brushed_metal">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#d1d1d1</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#444444</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#c9c9c9</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#444444</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#162bc0</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#d2000c</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#6c6c6c</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#ff000b</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#ff0000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#0000ff</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#008000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#cfcfcf</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">31</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QToolBar { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); border: 1px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; min-width: 5ex; padding: 2px; }
-
-QToolButton:pressed { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #a7a7a7, stop: 0.4 #a7a7a7, stop: 0.7 #a7a7a7, stop: 1.0 #a7a7a7); border: 2px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 4px; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; border-top-right-radius: 4px; min-width: 5ex; padding: 2px; }
-
-QLineEdit { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); border: 3px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; }
-
-QTabBar::tab:selected { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #eaf1fb, stop: 0.4 #b7d4f4, stop: 0.5 #7cb6e9, stop: 1.0 #c9f9ff); border: 1px solid #3c3396; border-bottom-color: #55697b; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; padding: 5px; }
-
-QFrame#log { background-color: #ffffff; border: 1px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; min-width: 5ex; padding: 2px; }
-
-Q3ListView { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #ebebeb, stop: 0.7 #ebebeb, stop: 1.0 #ebebeb); border: 1px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; min-width: 5ex; padding: 2px; }
-
-QLabel#lb_status { background: argb(0,0,0,0); border: -1px solid #ffffff; }
-
-QLabel#lb_client { background: argb(0,0,0,0); border: -1px solid #ffffff; }
-
-QLabel { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); border: 3px solid #c8c8c8; border-bottom-color: #ececec; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; padding: 1px; }
-
-QToolButton::menu-indicator { image: none; }
-
-QTextEdit { background-color: #f5f5f5; border: 3px solid #c8c8c8; border-bottom-color: #c8c8c8; border-top-left-radius: 5px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; border-top-right-radius: 5px; }</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">true</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">true</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.look.font.chat type="QString">Lucida Grande,12,-1,5,50,0,0,0,0,0</options.ui.look.font.chat>
-        <options.ui.look.font.contactlist type="QString">Lucida Grande,11,-1,5,50,0,0,0,0,0</options.ui.look.font.contactlist>
-        <options.ui.look.font.message type="QString">Lucida Grande,12,-1,5,50,0,0,0,0,0</options.ui.look.font.message>
-        <options.ui.look.font.passive-popup type="QString">Lucida Grande,12,-1,5,50,0,0,0,0,0</options.ui.look.font.passive-popup>
-        <options.ui.contactlist.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAOQAAAKsAAAABAAAAAQAAAAIAAAACPwAAAAEAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewBjADMAOABkADkAMwAwADcALQAxADMAZQBkAC0ANAA5AGUAMQAtAGIAZQA3ADMALQAwADIAYwA1AGIAMwA0AGUAZgAyAGQANgB9AQAAAAD/////AAAAAAAAAAAAAAACAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADEAMwAwAGIAMwA1ADYAYwAtAGYAZQA3ADUALQA0AGMANAA5AC0AOAA2AGQANQAtADcAYQBkADYAZgAzADUAMwA4AGQANAA2AH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsANgBkADIAMgBhADkANwBmAC0AMgA3ADYAZgAtADQAMABjADAALQA5AGQAYwAwAC0AMgAwAGIAMgA2ADkANgBmAGMAYwA5AGIAfQEAAAAA/////wAAAAAAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA2ADgAOAA5ADYAOAA5ADYALQAyAGQAMgAzAC0ANAAwAGYAMwAtADkANQBkADcALQA2AGYAZQBjAGQAYgAwADgANwAxADYAMgB9AAAAAAD/////AAAAAAAAAAA=</options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>spacer</item>
-            <item>status_online</item>
-            <item>spacer</item>
-            <item>status_away</item>
-            <item>spacer</item>
-            <item>status_xa</item>
-            <item>spacer</item>
-            <item>status_dnd</item>
-            <item>spacer</item>
-            <item>status_offline</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">2</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{c38d9307-13ed-49e1-be73-02c5b34ef2d6}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Status</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">false</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>spacer</item>
-            <item>menu_add_contact</item>
-            <item>spacer</item>
-            <item>button_options</item>
-            <item>spacer</item>
-            <item>show_offline</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">3</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{6d22a97f-276f-40c0-9dc0-20b2696fcc9b}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Кнопки</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>spacer</item>
-            <item>show_offline</item>
-            <item>spacer</item>
-            <item>show_statusmsg</item>
-            <item>spacer</item>
-            <item>menu_join_groupchat</item>
-            <item>spacer</item>
-            <item>show_agents</item>
-            <item>spacer</item>
-            <item>enable_groups</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">2</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{130b356c-fe75-4c49-86d5-7ad6f3538d46}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">false</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type="bool">true</options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type="int">3</options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type="QString">{68896896-2d23-40f3-95d7-6fecdb087162}</options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type="bool">true</options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type="bool">false</options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAANEAAAKfAAAABAAAAAQAAAAIAAAACPwAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGMAMwA4AGQAOQAzADAANwAtADEAMwBlAGQALQA0ADkAZQAxAC0AYgBlADcAMwAtADAAMgBjADUAYgAzADQAZQBmADIAZAA2AH0AAAAAAP////8AAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewAxADMAMABiADMANQA2AGMALQBmAGUANwA1AC0ANABjADQAOQAtADgANgBkADUALQA3AGEAZAA2AGYAMwA1ADMAOABkADQANgB9AAAAAAD/////AAAAAAAAAAAAAAACAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADYAZAAyADIAYQA5ADcAZgAtADIANwA2AGYALQA0ADAAYwAwAC0AOQBkAGMAMAAtADIAMABiADIANgA5ADYAZgBjAGMAOQBiAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA2ADgAOAA5ADYAOAA5ADYALQAyAGQAMgAzAC0ANAAwAGYAMwAtADkANQBkADcALQA2AGYAZQBjAGQAYgAwADgANwAxADYAMgB9AQAAAAD/////AAAAAAAAAAA=</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">psiplus-activities.jisp</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">oxygen.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">oxygen_sys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">40</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">true</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">QMainWindow { 
-     background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/brushed_metal/brush.png) repeat-x #bebebe; }
-
-QToolButton {
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #f4f4f3, stop: 0.3 #f1f1f1, stop: 0.5 #d1d0d0, stop: 0.7 #bbbaba, stop: 1.0 #9d9c9b);
-     border: 1px solid #4a4949;
-     border-bottom-color: #4a4949;
-     border-radius: 4px; 
-     width: 25px; 
-     height: 21px; 
-     margin-bottom: 3px;
-}
-
-QToolButton:pressed {
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece);
-     border: 1px solid #4a4949;
-     border-bottom-color: #4a4949;
-     border-radius: 4px; 
-     width: 25px; 
-     height: 21px; 
-}
-
-QToolButton:checked {
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece);
-     border: 1px solid #4a4949;
-     border-bottom-color: #4a4949;
-     border-radius: 4px; 
-     width: 25px; 
-     height: 21px; 
-}
-
-QLineEdit { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #e6e6e6, stop: 0.1 #ffffff, stop: 0.5 #dededd, stop: 0.8 #fbfbfb, stop: 0.9 #ffffff, stop: 1.0 #e3e3e3); 
-border: 1px solid qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #5e5e5e,  stop: 1.0 #838383);
-     border-radius: 5px; 
-     border-top-left-radius: 0px; 
-     border-bottom-left-radius: 0px;
-     padding-left: 4px;
-     padding-right: 6px;
-     color: #2b2b2b;
-     margin-top: 4px; 
-     margin-left: -1px;
-     margin-bottom: 0px; 
-}
-
-PsiToolBar { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bebebe, stop: 0.3 #b6b6b6, stop: 0.5 #a8a8a8, stop: 0.7 #9f9f9f, stop: 1.0 #969696); 
-      border: 1px solid argb(0,0,0,30);  
-      border-bottom-left-radius: 5px; 
-      border-bottom-right-radius: 5px; 
-      border-top: 0px; 
-}
-
-PsiContactListView { 
-     margin-top: 2px; 
-     border: 1px solid #656565; 
-     border-left: 0px; 
-     border-right: 0px; 
-}
-

psi-plus-resources-1.tar.xz/skins/mac/brushed_metal/inf.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/NativeMac_tb.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/NativeMac_tb.skn Deleted

@@ -1,1193 +0,0 @@
-<skin version="0.1" path="/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac" author="tux-den" name="Native Mac (Bottom tabs)">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#cacfd4</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#272727</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#f3f3f3</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#464646</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#ff0000</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#910000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#00008a</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#336600</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">30</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">
-/* ---------- TabDlg --------- */
-TabDlg {
-	background: argb(0,0,0,0);
-	border: none;
-}
-/* End TabDlg--------- */
-
-
-
-
-
-/* ---------- HeaderFrame --------- */
-/* ------------------------ QFrame#headerFrame */
-QFrame#headerFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #d0d0d0, stop: 0.5 #cacaca, stop: 1.0 #c2c2c2) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/logo_active.png) no-repeat center center;
-	border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #d0d0d0, stop: 0.5 #d0d0d0, stop: 0.6 #e3e3e3, stop: 1.0 #e3e3e3);
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-
-QFrame:!active#headerFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 0.5 #eaeaea, stop: 1.0 #e7e7e7) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/logo_no_active.png) no-repeat center center;
-	border-top: 2px solid #f4f4f4;
-	border-left: 2px solid #ececec;
-	border-right: 2px solid #ececec;
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#hideButton */
-QToolButton#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide.png) center center no-repeat;
-	border-bottom: 0px solid #d0d0d0;
-	icon-size: 0px;
-	margin: 0px;
-	margin-top: 0px;
-	width: 14px;
-	height: 15px;
-}
-
-QToolButton:hover#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:hover#hideButton:!active {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:pressed#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_pressed.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#maximizeButton */
-QToolButton#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize.png) center center no-repeat;
-	icon-size: 0px;
-	margin: 0px;
-	margin-top: 0px;
-	width: 14px;
-	height: 15px;
-}
-
-QToolButton:hover#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:!active:hover#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:pressed#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_pressed.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#closeButton */
-QToolButton#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close.png) center center no-repeat;
-	icon-size: 0px;
-	margin: 0px;
-	margin-left: 1px;
-	margin-top: 0px;
-	width: 17px;
-	height: 15px;
-}
-
-QToolButton:hover#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_hover.png) no-repeat center argb(0,0,0,0);
-	min-width: 14px;
-	min-height: 15px;
-}
-
-QToolButton:!active:hover#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_hover.png) no-repeat center argb(0,0,0,0);
-	min-width: 14px;
-	min-height: 15px;
-}
-
-QToolButton:pressed#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_pressed.png) no-repeat center argb(0,0,0,0);
-}
-
-/* ------------------------ */
-
-QToolButton:!active#hideButton, QToolButton:!active#closeButton, QToolButton:!active#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_all_no_active.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-/* End HeaderFrame--------- */
-
-
-
-
-
-/* ---------- TopFrame--------- */
-/* ------------------------ QFrame#topFrame */
-QFrame#topFrame {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/topframe.png) repeat-x #a7a7a7;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-top: 0px solid #ffffff;
-	margin-left: -10px;
-	margin-right: -6px;
-}
-
-QFrame:!active#topFrame {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/topframe_no_active.png) repeat-x #d8d8d8;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	margin-left: -10px;
-	margin-right: -6px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QWidget#avatar */
-QWidget#avatar {
-	margin-left: 19px;
-	margin-bottom: 3px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QPushButton#pb_topic */
-QPushButton#pb_topic {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fefefe, stop: 0.6 #c8c8c8, stop: 1.0 #b8b8b8);
-	border: 1px solid #545454;
-	border-radius: 3px;
-	margin-bottom: 5px;
-	margin-left: 15px;
-	height: 20px;
-	width: 55px;
-}
-

psi-plus-resources-1.tar.xz/skins/mac/native_mac/NativeMac_tt.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/NativeMac_tt.skn Deleted

@@ -1,1335 +0,0 @@
-<skin version="0.1.1" path="/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac" author="tuxden" name="Native Mac (Top tabs)">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#cacfd4</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#272727</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#f3f3f3</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#464646</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#ff0000</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#910000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#00008a</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#336600</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">30</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">
-/* ---------- TabDlg --------- */
-TabDlg {
-	background: argb(0,0,0,0);
-	border: none;
-}
-/* End TabDlg--------- */
-
-
-
-
-
-/* ---------- HeaderFrame --------- */
-/* ------------------------ QFrame#headerFrame */
-QFrame#headerFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #d0d0d0, stop: 0.5 #cacaca, stop: 1.0 #c2c2c2) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/logo_active.png) no-repeat center center;
-	border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #d0d0d0, stop: 0.5 #d0d0d0, stop: 0.6 #e3e3e3, stop: 1.0 #e3e3e3);
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-
-QFrame:!active#headerFrame {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ededed, stop: 0.5 #eaeaea, stop: 1.0 #e7e7e7) url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/logo_no_active.png) no-repeat center center;
-	border-top: 2px solid #f4f4f4;
-	border-left: 2px solid #ececec;
-	border-right: 2px solid #ececec;
-	border-radius: 5px;
-	border-bottom-left-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#hideButton */
-QToolButton#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide.png) center center no-repeat;
-	border-bottom: 0px solid #d0d0d0;
-	icon-size: 0px;
-	margin: 0px;
-	margin-left: 0px;
-	margin-top: 0px;
-	width: 14px;
-	height: 15px;
-}
-
-QToolButton:hover#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:hover#hideButton:!active {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:pressed#hideButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_hide_pressed.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#maximizeButton */
-QToolButton#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize.png) center center no-repeat;
-	icon-size: 0px;
-	margin: 0px;
-	margin-top: 0px;
-	width: 14px;
-	height: 15px;
-}
-
-QToolButton:hover#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:!active:hover#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_hover.png) no-repeat center argb(0,0,0,0);
-}
-
-QToolButton:pressed#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_maximize_pressed.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-
-
-/* ------------------------ QToolButton#closeButton */
-QToolButton#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close.png) center center no-repeat;
-	icon-size: 0px;
-	margin: 0px;
-	margin-left: 2px;
-	margin-top: 0px;
-	width: 17px;
-	height: 15px;
-}
-
-QToolButton:hover#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_hover.png) no-repeat center argb(0,0,0,0);
-	min-width: 14px;
-	min-height: 15px;
-}
-
-QToolButton:!active:hover#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_hover.png) no-repeat center argb(0,0,0,0);
-	min-width: 14px;
-	min-height: 15px;
-}
-
-QToolButton:pressed#closeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_close_pressed.png) no-repeat center argb(0,0,0,0);
-}
-
-/* ------------------------ */
-
-QToolButton:!active#hideButton, QToolButton:!active#closeButton, QToolButton:!active#maximizeButton {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/c_toolbutton/c_tb_all_no_active.png) no-repeat center argb(0,0,0,0);
-}
-/* ------------------------ */
-/* End HeaderFrame--------- */
-
-
-
-
-
-/* ---------- TopFrame--------- */
-/* ------------------------ QFrame#topFrame */
-QFrame#topFrame {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/b_topframe.png) repeat-x #dddddd;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-top: 0px solid #515151;
-	margin-left: -10px;
-	margin-right: -6px;
-}
-
-QFrame:!active#topFrame {
-	background: url(/Applications/Psi+.app/Contents/Resources/skins/mac/native_mac/images/b_topframe_no_active.png) repeat-x #eeeeee;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3b3b3, stop: 1.0 #bbbbbb);
-	margin-left: -10px;
-	margin-right: -6px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QWidget#avatar */
-QWidget#avatar {
-	min-width: 60px;
-	min-height:25px;
-}
-/* ------------------------ */
-
-
-/* ------------------------ QPushButton#pb_topic */
-QPushButton#pb_topic {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c9c9c9, stop: 0.6 #909090, stop: 1.0 #818181);
-	border: 1px solid #404040;
-	border-left: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2c2c2c, stop: 0.5 #222222, stop: 1.0 #2e2e2e);
-	border-right: 1px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2c2c2c, stop: 0.5 #222222, stop: 1.0 #2e2e2e);
-	border-radius: 11px;
-	margin-left: 12px;
-	padding-left: 4px;
-	padding-right: 2px;

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_all_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_close.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_close_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_close_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_hide.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_hide_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_hide_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_maximize.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_maximize_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/c_toolbutton/c_tb_maximize_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/c_tb_all_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_close.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_close_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_close_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_hide.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_hide_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_hide_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_maximize.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_maximize_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/g_toolbutton/g_tb_maximize_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/b_topframe.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/b_topframe_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/find_user.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/logo_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/logo_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/psi_filter_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/psi_filter_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/qcombobox.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/res_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/res_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/topframe.png Deleted

psi-plus-resources-1.tar.xz/skins/mac/native_mac/images/topframe_no_active.png Deleted

psi-plus-resources-1.tar.xz/skins/universal Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/BranchEnd.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/BranchMore.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ChatEdit.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ChatLog.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ChatTopFrame.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/CloseButton.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/CloseButtonHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/CloseButtonPressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/Dot.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/LunnaCat.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/LunnaCat.skn Deleted

@@ -1,1350 +0,0 @@
-<skin version="1.1_(2011-06-11)" path="D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1" author="majik" name="LunnaCat">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#2f9fff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#2d9bff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#0a373c</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#0a373c</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#14a0b4</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#0f646e</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#4be1e1</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#32a5b9</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#328296</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#001e1e</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#4bd7ff</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#3c7896</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#9bdcc3</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#006e6e</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#009bff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#00d200</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#37eb73</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#4bd7ff</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#ff0004</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#32a5b9</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#001e1e</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#0a373c</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#37aabe</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#0e2e35</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#001e1e</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">true</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">32</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">TabDlg {
-	background-color: #000000;}
-
-/* общий фрейм */
-QFrame {
-	color: #32C8C3;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ChatTopFrame.png) right bottom;
-	background-color: argb(182,200,80,0);
-	border: 0px;
-	padding: 0px;}
-
-/* кнопки в шапке окна в режиме без декора */
-QToolButton#hideButton {
-	width: 16px;
-	height: 16px;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MinimizeButton.png) center no-repeat;
-	icon-size: 0px;
-	border: 0px;}
-
-QToolButton#hideButton:hover {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MinimizeButtonHover.png) center no-repeat;}
-
-QToolButton#hideButton:pressed {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MinimizeButtonPressed.png) center no-repeat;}
-
-QToolButton#maximizeButton {
-	width: 16px;
-	height: 16px;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MaximizeButton.png) center no-repeat;
-	icon-size: 0px;
-	border: 0px;}
-
-QToolButton#maximizeButton:hover {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MaximizeButtonHover.png) center no-repeat;}
-
-QToolButton#maximizeButton:pressed {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/MaximizeButtonPressed.png) center no-repeat;}
-
-QToolButton#closeButton {
-	width: 16px;
-	height: 16px;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/CloseButton.png) center no-repeat;
-	icon-size: 0px;
-	border: 0px;}
-
-QToolButton#closeButton:hover {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/CloseButtonHover.png) center no-repeat;}
-
-QToolButton#closeButton:pressed {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/CloseButtonPressed.png) center no-repeat;}
-
-/* верхний фрейм */
-QFrame#topFrame {
-	margin: 0px;
-	margin-bottom: 2px;
-	border: 0px;}
-
-/* кнопка топика */
-QPushButton#pb_topic {
-	margin: 0px;
-	height: 16px;
-	color: #4BD7FF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.55 #1A474C, stop: 1 #4BD7FF);
-	font-weight: bold;
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-QPushButton#pb_topic:hover {
-	color: #DBD7DF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #8BF7FF, stop: 0.55 #0F97AC, stop: 1 #8BF7FF);}
-
-QPushButton#pb_topic:pressed {
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.55 #1A474C, stop: 1 #4BD7FF);}
-
-/* диалог топика */
-QWidget#pte_topic {
-	color: #32C8C3;
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: #001E1F;
-	border: 1px inset #3C7896;
-	border-radius: 3px;}
-
-/* иконка статуса */
-QLabel#lb_status {
-	border: 0px;
-	background: argb(182,200,80,0);}
-
-/* топик / джид */
-ActionLineEdit#le_topic,#le_jid {
-	color: #4BD7FF;
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.28 argb(188,255,120,40), stop: 0.8 argb(188,255,120,40), stop: 1 #4BD7FF);
-	font-weight: bold;
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* джид - ниспадающее меню */
-QComboBox::drop-down#le_jid {
-	height: 20px;
-	border-left: 1px solid #2D9BB8;
-	background-color: argb(188,255,120,50);}
-
-QComboBox::down-arrow#le_jid {
-	width: 9px;
-	image: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/ScrollBarArrowDown.png);}
-
-QComboBox#le_jid QAbstractItemView {
-	color: #4BD7FF;
-	selection-background-color: argb(188,255,120,50);
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png);
-	background-color: argb(182,200,80,40);
-show-decoration-selected: 0;
-	border: 1px outset #3C7896;}
-
-QComboBox::focus#le_jid QAbstractItemView {
-	border-color: red;
-	border: 1px;}
-
-/* диалоговое окно букмарок */
-QDialog {
-	background: url(D:/!Bakup/Portable/Psi/Psi+/skins/LunnaCat_1.1/Tooltip.png) right top;
-	background-color: argb(182,200,80,0);}
-
-QDialog>QFrame {
-	color: #4BD7FF;
-	background: argb(182,200,80,0);}
-
-QDialog>QLineEdit {
-	color: #4BD7FF;
-	background: argb(182,200,80,40);
-	border: 1px inset #3C7896;
-	border-radius: 3px;}
-
-QDialog>QCheckBox {
-	background: argb(182,200,80,0);}
-
-/* иконка клиента */
-QLabel#lb_client {
-	border: 0px;
-	background: argb(182,200,80,0);}
-
-/* счётчик символов */
-QLabel#lb_count {
-	color: #4BD7FF;
-	background: argb(182,200,80,0);
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4BD7FF, stop: 0.28 argb(188,255,120,40), stop: 0.8 argb(188,255,120,40), stop: 1 #4BD7FF);
-	font-weight: bold;
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* имя аккаунта */
-QLabel#lb_ident {
-	color: #0A373C;
-	background: argb(188,255,120,0);
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #0A373C, stop: 0.18 #4BD7FF, stop: 0.9 #4BD7FF, stop: 1 #0A373C);
-	font-weight: bold;
-	border: 1px solid #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* чатлог */
-QFrame#log {

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MaximizeButton.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MaximizeButtonHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MaximizeButtonPressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MinimizeButton.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MinimizeButtonHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/MinimizeButtonPressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/RadioButton.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/RadioButtonHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/RadioButtonUnchecked.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/RadioButtonUncheckedHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/Roster.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ScrollBarArrowDown.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ScrollBarArrowLeft.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ScrollBarArrowRight.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/ScrollBarArrowUp.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterH.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterHH.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterHP.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterV.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterVH.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/SplitterVP.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/TabBar.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/TabCloseButton.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/TabCloseButtonHover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/TabCloseButtonPressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/LunnaCat/Tooltip.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/black_theme Deleted

psi-plus-resources-1.tar.xz/skins/universal/black_theme/black_theme.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/black_theme/black_theme.skn Deleted

@@ -1,577 +0,0 @@
-<skin version="0.5" author="tux-den" name="Black theme">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#f0f0f0</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#5a5a5a</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#969696</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#ff000b</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#000000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#000000</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#000000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#cfcfcf</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">3</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">25</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QWidget {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c5c5c5, stop: 0.3 #bfbfbf, stop: 0.5 #b5b5b5, stop: 0.8 #ababab, stop: 1.0 #a6a6a6);
-     border: 4px solid #c5c5c5; 
-     border-bottom-color: #a6a6a6;
-}
-
-QScrollBar:vertical {
-     background-color: #ebebeb;
-     border: 2px solid #cdcdcd;
-     border-bottom-color: #cdcdcd;
-}
-
-QScrollBar::handle:vertical {
-     background-color: #c5c5c5;
-     border: 2px solid #f5f5f5;
-     border-bottom-color: #f5f5f5;
-}
-
-QScrollBar::add-line:vertical {
-     border: 0px; height: 0px;
-     subcontrol-position: bottom;
-}
-
-QScrollBar::sub-line:vertical {
-     border: 0px; height: 0px;
-     subcontrol-position: top;
-}
-
-QScrollBar:horizontall {
-     background-color: #ebebeb;
-     border: 1px solid #cdcdcd;
-     border-bottom-color: #cdcdcd;
-}
-
-QScrollBar::handle:horizontall {
-     background-color: #c5c5c5;
-     border: 2px solid #f5f5f5;
-     border-bottom-color: #f5f5f5;
-}
-
-QScrollBar::add-line:horizontall {
-     border: 0px; height: 0px;
-     subcontrol-position: bottom;
-}
-
-QScrollBar::sub-line:horizontall {
-     border: 0px; height: 0px;
-     subcontrol-position: top;
-}
-
-QToolBar {
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #c5c5c5, stop: 0.3 #bfbfbf, stop: 0.5 #b5b5b5, stop: 0.8 #ababab, stop: 1.0 #a6a6a6);
-     border: 3px solid #c5c5c5; 
-     border-bottom-color: #a6a6a6;  
-     border-top-left-radius: 4px; 
-     border-bottom-left-radius: 4px; 
-     border-bottom-right-radius: 4px; 
-     border-top-right-radius: 4px; 
-}
-
-QTabBar::tab:selected { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #eaf1fb, stop: 0.4 #b7d4f4, stop: 0.5 #7cb6e9, stop: 1.0 #c9f9ff); 
-     border: 1px solid #3c3396; 
-     border-bottom-color: #55697b; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px; 
-     padding: 5px; 
-}
-
-QToolTip { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 1.5px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-} 
-
-QToolButton  { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #f4f4f3, stop: 0.3 #f1f1f1, stop: 0.5 #d1d0d0, stop: 0.7 #bbbaba, stop: 1.0 #9d9c9b); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-radius: 4px; 
-     width: 30px; 
-     height: 22px; 
-}
-
-QToolButton:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-top-left-radius: 4px; 
-     border-bottom-left-radius: 4px; 
-     border-bottom-right-radius: 4px; 
-     border-top-right-radius: 4px; 
-     width: 30px; 
-     height: 22px; 
-} 
-
-QToolButton:checked { 
-     background: qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #a09f9e, stop: 0.3 #acabaa, stop: 0.5 #cfcece, stop: 0.7 #cfcece, stop: 1.0 #cfcece); 
-     border: 1px solid #4a4949; 
-     border-bottom-color: #4a4949; 
-     border-top-left-radius: 4px; 
-     border-bottom-left-radius: 4px; 
-     border-bottom-right-radius: 4px; 
-     border-top-right-radius: 4px; 
-     width: 30px; 
-     height: 22px; 
-}
-
-QPushButton { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fcfcfc, stop: 0.3 #f5f5f5, stop: 0.4 #f0efef, stop: 0.5 #e5e6e5, stop: 0.7 #ffffff, stop: 1.0 #ffffff); 
-     border: 1.4px solid #5c5c5c; 
-     border-bottom-color: #5c5c5c; 
-     width: 120px; 
-     height: 20px; 
-     border-radius: 11px; 
-} 
-
-QPushButton:hover:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3c5e1, stop: 0.3 #95bbdf, stop: 0.4 #82b1dd, stop: 0.5 #69a2d7, stop: 0.7 #87b6e3, stop: 1.0 #b3e2f7); 
-     border: 1px solid #1b008c; 
-     border-bottom-color: #5b5b5b; 
-     width: 80px; height: 2px; 
-     border-top-left-radius: 11px; 
-     border-bottom-left-radius: 11px; 
-     border-bottom-right-radius: 11px; 
-     border-top-right-radius: 11px; 
-}
-
-QPushButton#pb_topic { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fcfcfc, stop: 0.3 #f5f5f5, stop: 0.4 #f0efef, stop: 0.5 #e5e6e5, stop: 0.7 #ffffff, stop: 1.0 #ffffff); 
-     border: 1.4px solid #5c5c5c; 
-     border-bottom-color: #5c5c5c; 
-     width: 65px; 
-     height: 20px; 
-     border-top-left-radius: 11px; 
-     border-bottom-left-radius: 11px; 
-     border-bottom-right-radius: 11px; 
-     border-top-right-radius: 11px; 
-     margin:7px; 
-} 
-
-QPushButton:hover:pressed#pb_topic { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b3c5e1, stop: 0.3 #95bbdf, stop: 0.4 #82b1dd, stop: 0.5 #69a2d7, stop: 0.7 #87b6e3, stop: 1.0 #b3e2f7); 
-     border: 1px solid #1b008c; 
-     border-bottom-color: #5b5b5b; 
-     width: 80px; 
-     height: 2px; 
-     border-top-left-radius: 11px; 
-     border-bottom-left-radius: 11px; 
-     border-bottom-right-radius: 11px; 
-     border-top-right-radius: 11px; 
-}
-
-QLineEdit { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f5f5f5, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9); 
-     border: 3px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-     border-top-left-radius: 5px; 
-     border-bottom-left-radius: 5px; 
-     border-bottom-right-radius: 5px; 
-     border-top-right-radius: 5px;
-}

psi-plus-resources-1.tar.xz/skins/universal/blue_skin Deleted

psi-plus-resources-1.tar.xz/skins/universal/blue_skin/blue_skin.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/blue_skin/blue_skin.skn Deleted

@@ -1,204 +0,0 @@
-<skin version="1.1" path="/home/hryukin/.psi/skins/universal" author="Dealer_WeARE" name="Blue_skin">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#2c9dff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#b5e3ff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#9cbaff</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QString">#00007f</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QString">#375cff</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#000000</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QString">#000000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QString">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QString">#0055ff</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#4f64c0</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#00007f</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#aa0000</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#5555ff</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#22603e</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#910000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#00008a</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#336600</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#a9b5ff</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#a9bcff</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">true</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">32</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QFrame { background-color: #b4ccff; border: 1px solid blue; border-radius: 6px; padding: 2px}
-QToolButton { background-color: #e9edff; border: 1px solid blue; border-radius: 4px; padding: 2px}
-QToolButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 black)}
-QToolButton:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, stop: 1 #e9edff )}
-QToolButton:checked {border-top: 2px solid blue; border-left: 2px solid blue; padding-bottom: 1px; padding-right: 1px; background-color: #aebece}
-QLabel { background-color: #b5e3ff }
-QLabel#lb_status {background-color: #b4ccff; border: 0px; ; border-radius: 0px; padding: 0px }
-QLabel#lb_client {background-color: #b4ccff; border: 0px; ; border-radius: 0px; padding: 0px }
-QToolBar { background-color: #b5e3ff; border: 1px solid blue; border-radius: 4px; padding: 2px } 
-QTextEdit { background-color: #eefeff } 
-QLineEdit { background-color: #e9edff; border: 1px solid blue; border-radius: 6px; padding: 2px }
-QPushButton { background-color: #e9edff; border: 1px solid blue; border-radius: 4px; } 
-QPushButton#pb_topic { border-radius: 0px }
-QPushButton:hover:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, stop: 1 #e9edff )}
-QPushButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 black)}
-Q3ListView * { background-color: #e9edff; }
-QFrame#log * { background-color: #eefeff } 
-QTabBar::tab { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,  stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,   stop: 0.5 #D8D8D8, stop: 1.0 #D3D3D3);   border: 2px solid #C4C4C3;  border-bottom-color: #C2C7CB;   border-top-left-radius: 4px;border-top-right-radius: 4px;  min-width: 8ex;  padding: 2px }
-QTabBar::tab:selected, QTabBar::tab:hover { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fafafa, stop: 0.4 #f4f4f4, stop: 0.5 #e7e7e7, stop: 1.0 #fafafa) }
-QTabBar::tab:selected { border-color: #9B9B9B;  border-bottom-color: #C2C7CB }
-QToolTip {background-color: #a9bcff;   border: 2px solid blue;         padding: 2px;  border-radius: 4px; }
-QMenu {background-color: #a9bcff;  border: 1px solid blue}
-QMenu::item { background-color: #a9bcff; border: 1px solid transparent; padding: 2px 25px 2px 20px;}
-QMenu::item:selected {background-color: #e9edff; border-color: darkblue;}
-QMenu::separator { height: 2px; background: lightblue;  }
-QMenu::item:checked { background-color: #e9edff }
-TabDlg { background-color: #b4ccff; }</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.look.font.chat type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</options.ui.look.font.chat>
-        <options.ui.look.font.contactlist type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</options.ui.look.font.contactlist>
-        <options.ui.look.font.message type="QString">Sans Serif,9,-1,5,50,0,0,0,0,0</options.ui.look.font.message>
-        <options.ui.look.font.passive-popup type="QString">Sans Serif,8,-1,5,50,0,0,0,0,0</options.ui.look.font.passive-popup>
-        <options.ui.contactlist.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAOgAAAKnAAAABAAAAAQAAAAIAAAACPwAAAAMAAAAAAAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA1ADMANQA2ADMAOAAxAGMALQBiADgANwBmAC0ANAA5AGIAMAAtADkAMwBmADAALQBhADgAZgAwADkAMwBmAGQAYQA5AGEAMAB9AwAAAAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAYQAzADIAMgAwADAAMgA4AC0AZQBhAGMAMgAtADQAZQBhAGIALQA5ADAAMABlAC0AMAAzADUAZABkAGYAYQA3AGYANgBiADcAfQMAAAAA/////wAAAAAAAAAAAAAAAgAAAAAAAAACAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGYAYQA1ADIAYwA1AGEAMAAtADgAYgA5AGMALQA0ADEAZQA2AC0AOABhADIAYgAtAGEANAA5ADgAOAA3ADcAZgA5ADkAMwAwAH0BAAAAAP////8AAAAAAAAAAAAAAAIAAAAAAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewBkAGMAYwA4ADgAZQBmADkALQA4ADIAMQAwAC0ANAAyADEAZgAtAGIAMgA0AGQALQBiADkAMgBmADQAZgA5ADUANwA1AGIANgB9AQAAAAD/////AAAAAAAAAAAAAAACAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADQAZQBkADcAYgBiADAAMgAtADIANQA5AGIALQA0ADgAMwBkAC0AYQA4ADYANQAtADYAMAAzADUAOABhAGQAOABlADIAMwBmAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAYgAxADQAYQA1AGYAYwBiAC0AMwA5AGYANwAtADQAMgA3AGUALQA4ADQANQBjAC0AZgA2ADAAYwA2ADIAMABiAGMAZgBmAGQAfQEAAAAAAAAAsgAAAAAAAAAAAAAAAwAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7ADAAOQAzADYANQA5AGEAZgAtADkAZAA0ADgALQA0ADUAMwBhAC0AOQAwAGEANgAtAGQAMwBlADEAMQBmAGYANwBlADUAOABhAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAOQA2AGUAMAAyADIAZAA4AC0ANwA4AGEAMQAtADQAYQBmADMALQA5ADQAOQAzAC0AMQAzADIAMgAxADAANABhAGYAYwBlADUAfQAAAAAA/////wAAAAAAAAAA</options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>button_options</item>
-            <item>separator</item>
-            <item>button_status</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{b14a5fcb-39f7-427e-845c-f60c620bcffd}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Buttons</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>spacer</item>
-            <item>menu_options</item>
-            <item>spacer</item>
-            <item>menu_account_setup</item>
-            <item>spacer</item>
-            <item>menu_join_groupchat</item>
-            <item>spacer</item>
-            <item>set_geoloc</item>
-            <item>spacer</item>
-            <item>view_groups</item>
-            <item>spacer</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{093659af-9d48-453a-90a6-d3e11ff7e58a}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Show contacts</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{96e022d8-78a1-4af3-9493-1322104afce5}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Event notifier</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">false</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAAOsAAANpAAAABAAAAAQAAAAIAAAACPwAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewA5ADYAZQAwADIAMgBkADgALQA3ADgAYQAxAC0ANABhAGYAMwAtADkANAA5ADMALQAxADMAMgAyADEAMAA0AGEAZgBjAGUANQB9AAAAAAD/////AAAAAAAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGIAMQA0AGEANQBmAGMAYgAtADMAOQBmADcALQA0ADIANwBlAC0AOAA0ADUAYwAtAGYANgAwAGMANgAyADAAYgBjAGYAZgBkAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAMAA5ADMANgA1ADkAYQBmAC0AOQBkADQAOAAtADQANQAzAGEALQA5ADAAYQA2AC0AZAAzAGUAMQAxAGYAZgA3AGUANQA4AGEAfQEAAAAA/////wAAAAAAAAAA</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">default</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.emoticons type="QStringList">
-            <item>quip.jisp</item>
-        </options.iconsets.emoticons>
-        <options.iconsets.moods type="QString">rederick-moods-16.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">stafex_psi_mod.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">oxygen_sys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">64</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">true</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">QMainWindow {background-color: #b4ccff}
-QToolTip {background-color: #a9bcff;   border: 2px solid blue;         padding: 2px;  border-radius: 4px; }
-QToolButton { background-color: #e9edff; border: 1px solid blue; border-radius: 4px; padding: 3px; } 
-QToolButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 black)}
-QToolButton:checked {border-top: 2px solid blue; border-left: 2px solid blue; padding-bottom: 1px; padding-right: 1px; background-color: #aebece}
-QToolButton:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, stop: 1 #e9edff )}
-QFrame { background-color: #b5e3ff; border: 1px solid blue; border-radius: 6px; padding: 3px} 
-QToolBar { background-color: #b5e3ff; border: 1px solid blue; border-radius: 6px; padding: 4px; margin: 2px; margin-bottom: 1px}
-QToolBar > QToolButton { padding-left: 11px; padding-right: 11px; }
-QPushButton { background-color: #e9edff; border: 1px solid blue; border-radius: 6px;  padding: 6px; }
-QPushButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 black)}
-QPushButton:hover:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, stop: 1 #e9edff )}
-QToolButton::checked {background-color: #b5c8df; }
-QMenu  {background-color: #a9bcff;  border: 1px solid blue}
-QMenu::item { background-color: #a9bcff; border: 1px solid transparent; padding: 2px 25px 2px 20px;}
-QMenu::item:selected {background-color: #e9edff; border-color: darkblue;}
-QMenu::separator { height: 2px; background: lightblue;  }
-QMenu::item:checked { background-color: #e9edff }
-QLineEdit { background-color: #e9edff; border: 1px solid blue; border-radius: 6px; padding: 2px }
-QLabel#lb_avatar { background-color: #b4ccff; border: 0px; padding: 0px;}
-QLabel#lb_nick { background-color: #b4ccff; border: 0px}
-QTreeView { selection-background-color:  white; selection-color: black }
-QStackedWidget { background-color: blue; padding: 0px; border: 0px}</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">true</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">true</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">false</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">true</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">true</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">true</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">false</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString">QFrame {background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 #a9bcff); border: 1px solid blue; }</options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">false</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">true</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type="bool">false</options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray">AAAA/wAAAAAAAAABAAABJwEAAAAGAQAAAAE=</options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type=""></options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">true</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">true</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString">QFrame {background-color: #a9b5ff } QToolButton { background-color: #e9edff; border: 1px solid blue; border-radius: 2px}
-QToolButton:hover { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e9edff, stop: 1 black)}
-QToolButton:pressed { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, stop: 1 #e9edff )}</options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">true</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">true</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">true</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">false</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item></item>
-            <item>#aa0000</item>
-            <item>#5500ff</item>

psi-plus-resources-1.tar.xz/skins/universal/night Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/bottom.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/bottom_press.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/gr.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/gree.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/green.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/left.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/left_press.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/logo.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/night.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/night.skn Deleted

@@ -1,984 +0,0 @@
-<skin version="0.4" path="C:/Program Files/Psi+/skins/universal/night" author="tux-den" name="Night">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#b1ad84</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#c7caae</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#004209</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#555555</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#8a8a8a</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#e6e6e6</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#e6e6e6</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#8d8d8d</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#e6e6e6</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#bebebe</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#cb7273</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#6fb17a</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#939393</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#e6e6e6</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#e6e6e6</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#e6e6e6</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#e6e6e6</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#000000</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">27</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">TabDlg {
-	background: #11140f;
-	border: none;
-}
-
-PsiTabBar {
-	background: url(C:/Program Files/Psi+/skins/universal/night/gr.png) repeat-x qlineargradient(x1: 0, y1: 0, x1: 0, y2: 1, stop: 0 #11140f, stop: 1.0 #000000) ;
-	padding-top: 20px;
-	border-left: 3px solid #777777;
-	border-right: 3px solid #777777;
-	border-bottom: 2px solid argb(0,0,100,250);
-	alignment: center;
-}
-
-QToolBar {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,250,200);
-}
-
-QToolBar#toolbar {
-	background: url(C:/Program Files/Psi+/skins/universal/night/gr.png) repeat-x;
-	border: 1px solid argb(0,0,100,150);
-	border-radius: 3px;
-	border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
-	padding: 0px;
-}
-
-QWidget#pte_topic {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200);
-}
-
-GroupchatTopicDlg {
-	background: #11140f;
-	border: none
-}
-
-QDialog#MUCConfig {
-	background: #11140f;
-	border: none;
-}
-
-QLineEdit#le_filter {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200)
-}
-
-QWidget#tab_affiliations {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200)
-}
-
-QWidget#tab_general {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200)
-}
-
-QFrame#tv_affiliations {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200);
-}
-
-QFrame#log {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200);
-	margin-left: 2px;
-	margin-right: 2px;
-}
-
-QFrame#topFrame {
-	background: #11140f;
-	border-left: 3px solid #777777;
-	border-right: 3px solid #777777;
-	margin-right: 0px;
-}
-
-QDialog {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200);
-}
-
-QDialog>QFrame {
-	color: #ffffff;
-}
-
-QDialog>QLineEdit {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,220,200);
-}
-
-QWidget#bottomFrame {
-	background: #11140f;
-	border-left: 3px solid #777777;
-	border-right: 3px solid #777777;
-	border-bottom: 3px solid #777777;
-}
-
-QWidget#bottomFrame>QWidget>QTextEdit {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	border-radius: 5px;
-	color:  #ffffff;
-	margin-left: 4px;
-	margin-bottom: 4px;
-	margin-right: 4px;
-}
-
-QToolButton {
-	background: argb(0,0,50,100);
-	border: 1px solid #cccccc;
-	border-radius: 4px;
-	width: 22px;
-	height: 18px;
-	margin-left: 4px;
-	margin-right: 4px;
-	margin-top: 2px;
-	margin-bottom: 2px;
-}
-
-QToolButton:hover {
-	background: argb(0,0,100,150);
-	border-radius: 4px;	
-}
-
-QToolButton:pressed {
-	background: argb(0,0,250,130);
-}
-
-QToolButton:checked {
-	background: argb(0,0,250,130);
-	border-radius: 4px;
-}
-
-Q3ListView * {
-	background: #525252;
-	border: 2px solid #8b8b8b;
-	color:  argb(0,0,250,200)
-}
-
-QFrame#lv_users {
-	background: argb(0,0,0,0);
-	border: 1px solid #777777;
-	selection-background-color: argb(0,0,250,200); 
-	selection-color: #000000; 
-}
-
-QToolButton::menu-indicator {
-	image: none; 
-}
-
-PopupActionButton::menu-indicator {
-	image: none; 
-}
-

psi-plus-resources-1.tar.xz/skins/universal/night/right.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/right_press.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_close.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_close_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_close_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_hide.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_hide_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_hide_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_maximize.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_maximize_hover.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/tb_maximize_pressed.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/top.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/night/top_press.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/chat.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/down.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/down_pres.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/left.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/left_pres.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/menu.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/orange.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/psi.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/right.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/right_pres.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/splitter_hor.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/splitter_ver.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/tbar.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/the_orange.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/the_orange.skn Deleted

@@ -1,874 +0,0 @@
-<skin version="0.7" path="C:/Program Files/Psi+/skins/universal/orange" author="tux-den" name="the Orange">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#ffffff</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#000000</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#000000</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#4080c0</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#ff0000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#0000ff</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#008000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#ffc861</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">true</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">30</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">true</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QFrame#log {
-	border: 0px solid #ffffff;
-}
-
-QLineEdit#le_topic { 
-	background-color: argb(0,0,0,0); border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; 
-	color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	padding: 25px; 
-	margin-left: -20px; 
-} 
-  
-QToolBar {
-	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 0.1 #fbfbfb, stop: 0.4 #dee0e6, stop: 0.5 #c2c5d1, stop: 0.6 #c7cad5, stop: 0.7 #e1e3e9, stop: 0.9 #fbfbfb, stop: 1.0 #ffffff); 
-	border: 1px solid #b1b1b1; 
-}
-  
-QFrame#topFrame { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/chat.png) repeat-x #ffffff; 
-	border-right: 3px; 
-} 
-  
-QFrame#bottomFrame { 
-	background: #ffffff; 
-	border: 0px solid #ffffff; 
-} 
-  
-QTextEdit { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; 
-	font-size: 12px; 
-	color: #000000; 
-}
-  
-QLineEdit#le_topic { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	padding: 25px; 
-	margin-left: -20px; 
-} 
-  
-QLineEdit#le_jid { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	padding: 25px; 
-	margin-left: -20px; 
-} 
-  
-QFrame#lv_users { 
-	background: argb(0,0,0,0); 
-	border: 0px solid #ffffff; 
-	border-radius: 6px; font-size: 12px; 
-	margin-top: 1px; color: #000000; 
-	selection-background-color: argb(40,150,250,100); 
-	selection-color: #000000; 
-}
-  
-QSplitter::handle:horizontall { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/splitter_ver.png) no-repeat center #ffffff; 
-	height: 10px;
-} 
-  
-QSplitter::handle:vertical { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/splitter_hor.png) no-repeat center #ffffff;
-	height: 10px;
-} 
-  
-PsiTabBar { 
-	background: url(C:/Program Files/Psi+/skins/universal/orange/tbar.png) repeat-x #ffffff; 
-	border: 2px solid argb(20,100,160,180); 
-	border-left: 0px; 
-	border-right: 0px; 
-	border-bottom: 0px;
-	alignment: center;
-}
-
-QTabBar::tab:hover { 
-	background: argb(20,100,160,100); border: 1px solid argb(20,100,160,100); 
-	border-radius: 10px; 
-	height: 25px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	padding-left: 4px; 
-}
-
-QTabBar::tab:selected { 
-	background: argb(20,100,160,180); 
-	border: 2px solid argb(20,100,160,100); 
-	border-top: 0px solid #ffffff; 
-	border-radius: 10px; 
-	height: 25px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px; 
-	color: #ffffff; 
-	font-weight: bold; 
-	padding-left: 4px; 
-}
-
-QTabBar::tab { 
-	background: argb(20,100,160,60); 
-	border: 1px solid argb(20,100,160,100); 
-	border-radius: 10px; 
-	height: 25px; 
-	border-top-left-radius: 0px; 
-	border-top-right-radius: 0px;
-	padding-left: 4px; 
-}
- 
-QLabel#lb_client { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; 
-	color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	min-width: 10ex; 
-} 
-  
-QLabel#lb_count { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	margin-right: 10px; 
-} 
-  
-QLabel#lb_ident { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; 
-	color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	padding: 15px; 
-} 
-
-QLabel#lb_status { 
-	background-color: argb(0,0,0,0); 
-	border: 0px solid argb(0,0,0,30); 
-	border-radius: 6px; 
-	color: #7b3a00; 
-	font-size: 12px; 
-	font-weight: bold; 
-	padding-left: 15px; 
-	min-width: 8ex; 
-}
-
-QPushButton { 
-	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9bdb70, stop: 0.5 #2e990e,stop: 0.7 #0d7908, stop: 1 #006805); 
-	width: 105px; 
-	height: 22px; 
-	color: #ffffff; 
-	border: 1px solid #006805; 
-	border-radius: 11px;

psi-plus-resources-1.tar.xz/skins/universal/orange/tooltip.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/up.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/orange/up_pres.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/qip_infium Deleted

psi-plus-resources-1.tar.xz/skins/universal/qip_infium/qip_infium.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/qip_infium/qip_infium.skn Deleted

@@ -1,388 +0,0 @@
-<skin version="0.5" author="tux-den" name="QIP Infium">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#f7fbff</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#00008c</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#f6f8ff</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#110083</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#1e00b4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#0002b3</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#ff0004</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#0a00a2</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#4080c0</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#ff0000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#0000ff</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#008000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">false</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">24</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">false</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QFrame#log { 
-     background-color: #f5faff; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #a0a0a0; 
-     border-radius: 1px; 
-}
-
-QToolButton:pressed { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9c9c9c, stop: 0.4 #e2e2e2, stop: 0.5 #e4e4e4, stop: 0.6 #dedede, stop: 1.0 #e3e3e3); 
-     min-height: 1em;  
-     border: 1px solid #545454; 
-     border-bottom-color: #545454; 
-     border-radius: 4px; 
-}
-
-QToolBar {  
-     border: 0px solid #ffffff; 
-}
-
-Q3ListView { 
-     background-color: #f5faff; 
-}
-
-QWidget#bottomFrame>QWidget>QTextEdit { 
-     background-color: #f5faff; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #a0a0a0; 
-     border-radius: 1px; 
-}
-
-QLineEdit#lb_client { 
-     background-color: #f0f0f0; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QLineEdit#le_topic { 
-     background-color: #f0f0f0; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QLineEdit#le_jid { 
-     background-color: #f0f0f0; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QLabel#lb_ident { 
-     background-color: #f0f0f0; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QLabel#lb_countl { 
-     background-color: #f0f0f0; 
-     border: 1px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QLabel#lb_status { 
-     background-color: #f0f0f0; 
-     border: 0px solid #a0a0a0; 
-     border-bottom-color: #ffffff; 
-}
-
-QTabBar::tab { 
-     background-color: #e3e1db; 
-     border: 2px solid #C4C4C3; 
-     border-bottom-color: #C2C7CB; 
-     border-top-left-radius: 4px; 
-     border-top-right-radius: 4px; 
-     min-width: 8ex; 
-     padding: 2px; 
-}
-
-QTabBar::tab:selected, QTabBar::tab:hover { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,  stop: 0 #fafafa, stop: 0.4 #f4f4f4, stop: 0.5 #e7e7e7, stop: 1.0 #fafafa); 
-}
-
-QTabBar::tab:selected { 
-     border-color: #9B9B9B; 
-     border-bottom-color: #C2C7CB; 
-}
-
-QLabel#lb_client { 
-     border: 0px solid #ffffff; 
-}
-
-QToolButton::menu-indicator {
-     image: none; 
-}
-		
-</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>button_status</item>
-            <item>show_statusmsg</item>
-            <item>show_self</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{d6063d32-ec91-40a9-8cea-2b283c56115d}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Кнопки</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>show_offline</item>
-            <item>enable_groups</item>
-            <item>menu_play_sounds</item>
-            <item>show_hidden</item>
-            <item>menu_file_transfer</item>
-            <item>menu_toolbars</item>
-            <item>menu_new_message</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{0b44e443-5ed9-43c9-9dd2-7d2e277219fb}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>button_options</item>
-            <item>menu_disco</item>
-            <item>menu_add_contact</item>
-            <item>menu_account_setup</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{f814d7eb-c981-43f1-a054-97e39a595fee}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">true</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAAALwAAALqAAAABAAAAAQAAAAIAAAACPwAAAADAAAAAgAAAAEAAABsAG0AYQBpAG4AdwBpAG4ALQB0AG8AbwBsAGIAYQByAC0AewAwAGIANAA0AGUANAA0ADMALQA1AGUAZAA5AC0ANAAzAGMAOQAtADkAZABkADIALQA3AGQAMgBlADIANwA3ADIAMQA5AGYAYgB9AQAAAAD/////AAAAAAAAAAAAAAADAAAAAQAAAGwAbQBhAGkAbgB3AGkAbgAtAHQAbwBvAGwAYgBhAHIALQB7AGQANgAwADYAMwBkADMAMgAtAGUAYwA5ADEALQA0ADAAYQA5AC0AOABjAGUAYQAtADIAYgAyADgAMwBjADUANgAxADEANQBkAH0BAAAAAP////8AAAAAAAAAAAAAAAMAAAABAAAAbABtAGEAaQBuAHcAaQBuAC0AdABvAG8AbABiAGEAcgAtAHsAZgA4ADEANABkADcAZQBiAC0AYwA5ADgAMQAtADQAMwBmADEALQBhADAANQA0AC0AOQA3AGUAMwA5AGEANQA5ADUAZgBlAGUAfQEAAAAA/////wAAAAAAAAAA</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">CM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">psiplus-activities-16.jisp</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.emoticons type="QStringList">
-            <item>kolobok_light.jisp</item>
-        </options.iconsets.emoticons>
-        <options.iconsets.moods type="QString">silk.jisp</options.iconsets.moods>
-        <options.iconsets.status type="QString">qipinfium.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">qipinfium_sys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">true</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">45</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">true</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">true</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">PopupActionButton { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #fbfbfb, stop: 0.4 #e9e9e9, stop: 0.5 #e8e8e8, stop: 0.6 #d2d2d2, stop: 1.0 #f7f7f7); 
-     min-height: 1em;  
-     border: 1px solid #a8a8a8; 
-     border-bottom-color: #a8a8a8;

psi-plus-resources-1.tar.xz/skins/universal/sky Deleted

psi-plus-resources-1.tar.xz/skins/universal/sky/sky.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/sky/sky.skn Deleted

@@ -1,533 +0,0 @@
-<skin version="0.5" author="tux-den" name="Sky">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#f0f0f0</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#5a5a5a</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#969696</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#4080c0</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#ff0000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#0000ff</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#008000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">true</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">true</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">25</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">true</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QFrame#topFrame { 
-     background-color: #8ab4f6; 
-     border: none;
-     border-bottom-color: #8ab4f6; 
-     border-radius: 5px;  
-}
-
-QFrame#log { 
-     background-color: #ffffff; 
-     border: 3px solid #e4e4e4;  
-     border-radius: 7px;
-     margin-bottom: -2px; 
-     padding: 2px;
-}
-
-QToolBar { 
-     background-color: #e4e4e4; 
-     border: 4px solid #e4e4e4; 
-     border-bottom-color: #e4e4e4; 
-     border-top-left-radius: 6px; 
-     border-top-right-radius: 6px; 
-}
-
-QLineEdit#le_topic { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-radius: 3px; 
-     padding-left: 3px;
-}
-
-QLineEdit#le_jid { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-radius: 3px; 
-     padding-left: 3px;
-     padding-right: 3px;
-}
-
-QLabel#lb_status { 
-     background: argb(0,0,0,0);
-     border: none; 
-     padding: 0px; 
-}
-
-QLabel#lb_client { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-radius: 3px; 
-     padding: 2px;  
-}
-
-QLabel#lb_count { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-radius: 3px; 
-     padding: 2px;  
-}
-
-QLabel#lb_ident { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #ffffff; 
-     border-bottom-color: #ffffff; 
-     border-radius: 3px; 
-     padding: 2px;  
-}
-
-QWidget#bottomFrame { 
-     background-color: #fefefe; 
-     border: 1px solid #8d909c; 
-     border-bottom-color: #8d909c; 
-     border-radius: 5px; 
-}
-
-QWidget#bottomFrame>QWidget>QTextEdit { 
-     background-color: #ececec; 
-     border: 3px solid #e4e4e4; 
-     border-radius: 4px; 
-     margin-left: 10px;
-     margin-bottom: 6px;
-     padding-left: 3px; 
-     padding-top: -2px;
-}
-
-QPushButton#pb_send { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #8d909c; 
-     border-bottom-color: #8d909c; 
-     border-radius: 5px; 
-     min-width: 0ex; 
-     margin-right: 12px;
-     margin-top: 4px;
-     margin-left: 14px;
-     margin-bottom: 10px;
-     width: 30px;  
-}
-
-QPushButton:pressed#pb_send { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-     border: 1px solid #717171; 
-     border-bottom-color: #717171; 
-}
-
-QPushButton#pb_topic { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f0f0f0, stop: 0.4 #ebebeb, stop: 0.7 #dedede, stop: 1.0 #d9d9d9); 
-     border: 1px solid #8d909c; 
-     border-bottom-color: #8d909c; 
-     border-radius: 5px; 
-     width: 80px; 
-     height: 20px;
-     margin-right: 5px;
-     margin-bottom: 3px;
-     margin-top: 2px;
-}
-
-QPushButton:pressed#pb_topic { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-     border: 2px solid #717171; 
-     border-bottom-color: #717171; 
-}
-
-QToolButton { 
-     border: 1px solid #e4e4e4; 
-     width: 28px; 
-}
-
-QToolButton:hover { 
-     border: 1px solid #cccccc; 
-     border-radius: 5px;
-}
-
-QToolButton:pressed  { 
-       background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-     border: 1px solid #cccccc; 
-        border-radius: 5px;
-}
-
-QToolButton:checked  { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #aaaaaa, stop: 0.4 #d5d5d5, stop: 0.7 #d5d5d5, stop: 1.0 #c6c6c6); 
-     border: 1px solid #cccccc; 
-     border-radius: 5px;
-}
-
-QToolButton::menu-indicator {
-     image: none; 
-}
-
-QWidget#avatar { 
-     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ebebeb, stop: 0.4 #e0e0e0, stop: 0.7 #d3d3d3, stop: 1.0 #c9c9c9);  
-     border: 3px solid #c8c8c8; 
-     border-bottom-color: #ececec; 
-     border-radius: 5px; 
-     margin-right: 10px;
-     margin-left: 0px;
-     margin-bottom: 5px;
-}
-
-Q3ListView { 
-     background-color: #ffffff; 
-     border: 3px solid #e4e4e4; 
-     border-radius: 7px;

psi-plus-resources-1.tar.xz/skins/universal/tkabber Deleted

psi-plus-resources-1.tar.xz/skins/universal/tkabber/tkabber.png Deleted

psi-plus-resources-1.tar.xz/skins/universal/tkabber/tkabber.skn Deleted

@@ -1,206 +0,0 @@
-<skin version="0.3" author="tux-den" name="Tkabber">
-    <options>
-        <options.ui.look.colors.chat.link-color type="QColor">#0000ff</options.ui.look.colors.chat.link-color>
-        <options.ui.look.colors.chat.mailto-color type="QColor">#0000ff</options.ui.look.colors.chat.mailto-color>
-        <options.ui.look.colors.contactlist.background type="QColor">#ffffff</options.ui.look.colors.contactlist.background>
-        <options.ui.look.colors.contactlist.grouping.header-background type="QColor">#f0f0f0</options.ui.look.colors.contactlist.grouping.header-background>
-        <options.ui.look.colors.contactlist.grouping.header-foreground type="QColor">#5a5a5a</options.ui.look.colors.contactlist.grouping.header-foreground>
-        <options.ui.look.colors.contactlist.profile.header-background type="QColor">#969696</options.ui.look.colors.contactlist.profile.header-background>
-        <options.ui.look.colors.contactlist.profile.header-foreground type="QColor">#ffffff</options.ui.look.colors.contactlist.profile.header-foreground>
-        <options.ui.look.colors.contactlist.status.away type="QColor">#004bb4</options.ui.look.colors.contactlist.status.away>
-        <options.ui.look.colors.contactlist.status.do-not-disturb type="QColor">#7e0000</options.ui.look.colors.contactlist.status.do-not-disturb>
-        <options.ui.look.colors.contactlist.status.offline type="QColor">#646464</options.ui.look.colors.contactlist.status.offline>
-        <options.ui.look.colors.contactlist.status.online type="QColor">#000000</options.ui.look.colors.contactlist.status.online>
-        <options.ui.look.colors.contactlist.status-messages type="QColor">#808080</options.ui.look.colors.contactlist.status-messages>
-        <options.ui.look.colors.messages.highlighting type="QColor">#4080c0</options.ui.look.colors.messages.highlighting>
-        <options.ui.look.colors.messages.informational type="QColor">#008000</options.ui.look.colors.messages.informational>
-        <options.ui.look.colors.messages.received type="QColor">#0000ff</options.ui.look.colors.messages.received>
-        <options.ui.look.colors.messages.sent type="QColor">#ff0000</options.ui.look.colors.messages.sent>
-        <options.ui.look.colors.messages.usertext type="QColor">#606060</options.ui.look.colors.messages.usertext>
-        <options.ui.look.colors.muc.role-moderator type="QColor">#ff0000</options.ui.look.colors.muc.role-moderator>
-        <options.ui.look.colors.muc.role-norole type="QColor">#000000</options.ui.look.colors.muc.role-norole>
-        <options.ui.look.colors.muc.role-participant type="QColor">#0000ff</options.ui.look.colors.muc.role-participant>
-        <options.ui.look.colors.muc.role-visitor type="QColor">#008000</options.ui.look.colors.muc.role-visitor>
-        <options.ui.look.colors.passive-popup.border type="QColor">#5297f9</options.ui.look.colors.passive-popup.border>
-        <options.ui.look.colors.tooltip.background type="QColor">#e9ecc7</options.ui.look.colors.tooltip.background>
-        <options.ui.look.colors.tooltip.text type="QColor">#000000</options.ui.look.colors.tooltip.text>
-        <options.ui.look.contactlist.status-change-animation.color1 type="QColor">#000000</options.ui.look.contactlist.status-change-animation.color1>
-        <options.ui.look.contactlist.status-change-animation.color2 type="QColor">#969696</options.ui.look.contactlist.status-change-animation.color2>
-        <options.ui.contactlist.disable-scrollbar type="bool">false</options.ui.contactlist.disable-scrollbar>
-        <options.ui.contactlist.avatars.avatars-at-left type="bool">false</options.ui.contactlist.avatars.avatars-at-left>
-        <options.ui.contactlist.avatars.radius type="int">5</options.ui.contactlist.avatars.radius>
-        <options.ui.contactlist.avatars.show type="bool">false</options.ui.contactlist.avatars.show>
-        <options.ui.contactlist.avatars.size type="int">24</options.ui.contactlist.avatars.size>
-        <options.ui.contactlist.avatars.use-default-avatar type="bool">false</options.ui.contactlist.avatars.use-default-avatar>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.chat.css type="QString">QPushButton#pb_topic {  
-	width: 50px; 
-	height:15px; 
-	border: 0px solid #C4C4C3; 
-	min-width:3ex;  
-	padding: 3px;  
-	margin: 1px; 
-}
-
-QPushButton:hover#pb_topic { border: 2px solid #C4C4C3; }
-
-QToolBar { 
-	border: 0px solid #C4C4C3; 
-	min-width: 13ex;  
-	padding: 5px;  
-	margin: 1px; 
-}
-
-QTabBar::tab { 
-	border: 2px solid #fafafa; 
-	border-bottom-color: #a0a0a0;  
-	height: 25px; 
-}
-
-QTabBar::tab:selected { 
-	background-color: #e4e4e4; 
-	border: 2px solid #a0a0a0; 
-	border-bottom-color: #d4d4d4; 
-	height: 25px; 
-}
-
-QDialog QTabBar::tab {
-	width: 85px;
-}
-</options.ui.chat.css>
-        <options.ui.look.contactlist.use-outlined-group-headings type="bool">false</options.ui.look.contactlist.use-outlined-group-headings>
-        <options.ui.look.contactlist.use-slim-group-headings type="bool">false</options.ui.look.contactlist.use-slim-group-headings>
-        <options.ui.contactlist.toolbars-state type=""></options.ui.contactlist.toolbars-state>
-        <options.ui.contactlist.toolbars.m0.actions type="QStringList">
-            <item>button_status</item>
-        </options.ui.contactlist.toolbars.m0.actions>
-        <options.ui.contactlist.toolbars.m0.dock.nl type="bool">true</options.ui.contactlist.toolbars.m0.dock.nl>
-        <options.ui.contactlist.toolbars.m0.dock.position type="int">3</options.ui.contactlist.toolbars.m0.dock.position>
-        <options.ui.contactlist.toolbars.m0.key type="QString">{211704af-88a4-488c-a46f-b9b658d3ac14}</options.ui.contactlist.toolbars.m0.key>
-        <options.ui.contactlist.toolbars.m0.locked type="bool">true</options.ui.contactlist.toolbars.m0.locked>
-        <options.ui.contactlist.toolbars.m0.name type="QString">Кнопки</options.ui.contactlist.toolbars.m0.name>
-        <options.ui.contactlist.toolbars.m0.visible type="bool">true</options.ui.contactlist.toolbars.m0.visible>
-        <options.ui.contactlist.toolbars.m1.actions type="QStringList">
-            <item>menu_add_contact</item>
-            <item>menu_disco</item>
-            <item>menu_join_groupchat</item>
-            <item>show_offline</item>
-        </options.ui.contactlist.toolbars.m1.actions>
-        <options.ui.contactlist.toolbars.m1.dock.nl type="bool">true</options.ui.contactlist.toolbars.m1.dock.nl>
-        <options.ui.contactlist.toolbars.m1.dock.position type="int">2</options.ui.contactlist.toolbars.m1.dock.position>
-        <options.ui.contactlist.toolbars.m1.key type="QString">{7cbf7939-0cda-4992-9592-1aa9d5359a82}</options.ui.contactlist.toolbars.m1.key>
-        <options.ui.contactlist.toolbars.m1.locked type="bool">true</options.ui.contactlist.toolbars.m1.locked>
-        <options.ui.contactlist.toolbars.m1.name type="QString">Показ контактов</options.ui.contactlist.toolbars.m1.name>
-        <options.ui.contactlist.toolbars.m1.visible type="bool">true</options.ui.contactlist.toolbars.m1.visible>
-        <options.ui.contactlist.toolbars.m2.actions type="QStringList">
-            <item>event_notifier</item>
-        </options.ui.contactlist.toolbars.m2.actions>
-        <options.ui.contactlist.toolbars.m2.dock.nl type="bool">true</options.ui.contactlist.toolbars.m2.dock.nl>
-        <options.ui.contactlist.toolbars.m2.dock.position type="int">3</options.ui.contactlist.toolbars.m2.dock.position>
-        <options.ui.contactlist.toolbars.m2.key type="QString">{010ee98a-6edd-49ce-ae31-ad6c9f210168}</options.ui.contactlist.toolbars.m2.key>
-        <options.ui.contactlist.toolbars.m2.locked type="bool">true</options.ui.contactlist.toolbars.m2.locked>
-        <options.ui.contactlist.toolbars.m2.name type="QString">Обработка событий</options.ui.contactlist.toolbars.m2.name>
-        <options.ui.contactlist.toolbars.m2.visible type="bool">true</options.ui.contactlist.toolbars.m2.visible>
-        <options.ui.contactlist.toolbars.m3.actions type=""></options.ui.contactlist.toolbars.m3.actions>
-        <options.ui.contactlist.toolbars.m3.dock.nl type=""></options.ui.contactlist.toolbars.m3.dock.nl>
-        <options.ui.contactlist.toolbars.m3.dock.position type=""></options.ui.contactlist.toolbars.m3.dock.position>
-        <options.ui.contactlist.toolbars.m3.key type=""></options.ui.contactlist.toolbars.m3.key>
-        <options.ui.contactlist.toolbars.m3.locked type=""></options.ui.contactlist.toolbars.m3.locked>
-        <options.ui.contactlist.toolbars.m3.name type=""></options.ui.contactlist.toolbars.m3.name>
-        <options.ui.contactlist.toolbars.m3.visible type=""></options.ui.contactlist.toolbars.m3.visible>
-        <options.ui.save.toolbars-state type="QByteArray">AAAA/wAAAAD9AAAAAAAABC0AAAMqAAAABAAAAAQAAAAIAAAACPwAAAADAAAAAgAAAAAAAAADAAAAAAAAAAMAAAAA</options.ui.save.toolbars-state>
-        <options.ui.tabs.grouping type="QString">ACM</options.ui.tabs.grouping>
-        <options.iconsets.activities type="QString">default</options.iconsets.activities>
-        <options.iconsets.clients type="QString">fingerprint.jisp</options.iconsets.clients>
-        <options.iconsets.custom-status type=""></options.iconsets.custom-status>
-        <options.iconsets.moods type="QString">default</options.iconsets.moods>
-        <options.iconsets.status type="QString">tkabber.jisp</options.iconsets.status>
-        <options.iconsets.system type="QString">tkabber_sys.jisp</options.iconsets.system>
-        <options.ui.chat.avatars.show type="bool">false</options.ui.chat.avatars.show>
-        <options.ui.chat.avatars.size type="int">32</options.ui.chat.avatars.size>
-        <options.ui.chat.central-toolbar type="bool">false</options.ui.chat.central-toolbar>
-        <options.ui.chat.disable-paste-send type="bool">false</options.ui.chat.disable-paste-send>
-        <options.ui.chat.use-expanding-line-edit type="bool">false</options.ui.chat.use-expanding-line-edit>
-        <options.ui.chat.use-message-icons type="bool">false</options.ui.chat.use-message-icons>
-        <options.ui.contactlist.css type="QString">QToolBar { border: 0px solid;  padding: 2px; }
-
-PopupActionButton { 
-	min-height: 1.5em;  
-	border: 2px solid #ffffff; 
-	border-bottom-color: #a0a0a0; 
-	margin: 0px; 
-}
-
-QWidget#avatar { 
-	margin: 10px; 
-}
-
-QTreeView { 
-     alternate-background-color: #ffffff;
-}</options.ui.contactlist.css>
-        <options.ui.contactlist.enable-groups type="bool">true</options.ui.contactlist.enable-groups>
-        <options.ui.contactlist.show.agent-contacts type="bool">false</options.ui.contactlist.show.agent-contacts>
-        <options.ui.contactlist.show.offline-contacts type="bool">false</options.ui.contactlist.show.offline-contacts>
-        <options.ui.contactlist.show-activity-icons type="bool">false</options.ui.contactlist.show-activity-icons>
-        <options.ui.contactlist.show-all-client-icons type="bool">false</options.ui.contactlist.show-all-client-icons>
-        <options.ui.contactlist.show-client-icons type="bool">false</options.ui.contactlist.show-client-icons>
-        <options.ui.contactlist.show-geolocation-icons type="bool">false</options.ui.contactlist.show-geolocation-icons>
-        <options.ui.contactlist.show-group-counts type="bool">true</options.ui.contactlist.show-group-counts>
-        <options.ui.contactlist.show-menubar type="bool">true</options.ui.contactlist.show-menubar>
-        <options.ui.contactlist.show-mood-icons type="bool">false</options.ui.contactlist.show-mood-icons>
-        <options.ui.contactlist.show-status-icons type="bool">true</options.ui.contactlist.show-status-icons>
-        <options.ui.contactlist.show-tune-icons type="bool">false</options.ui.contactlist.show-tune-icons>
-        <options.ui.contactlist.status-icon-over-avatar type="bool">false</options.ui.contactlist.status-icon-over-avatar>
-        <options.ui.contactlist.status-messages.show type="bool">false</options.ui.contactlist.status-messages.show>
-        <options.ui.contactlist.status-messages.single-line type="bool">true</options.ui.contactlist.status-messages.single-line>
-        <options.ui.contactlist.tooltip.avatar type="bool">true</options.ui.contactlist.tooltip.avatar>
-        <options.ui.contactlist.tooltip.client-version type="bool">true</options.ui.contactlist.tooltip.client-version>
-        <options.ui.contactlist.tooltip.css type="QString"></options.ui.contactlist.tooltip.css>
-        <options.ui.contactlist.tooltip.geolocation type="bool">true</options.ui.contactlist.tooltip.geolocation>
-        <options.ui.contactlist.tooltip.last-status type="bool">true</options.ui.contactlist.tooltip.last-status>
-        <options.ui.contactlist.tooltip.pgp type="bool">true</options.ui.contactlist.tooltip.pgp>
-        <options.ui.contactlist.use-status-change-animation type="bool">true</options.ui.contactlist.use-status-change-animation>
-        <options.ui.contactlist.use-transport-icons type="bool">false</options.ui.contactlist.use-transport-icons>
-        <options.ui.emoticons.use-emoticons type="bool">true</options.ui.emoticons.use-emoticons>
-        <options.ui.mac.use-brushed-metal-windows type=""></options.ui.mac.use-brushed-metal-windows>
-        <options.ui.muc.colored-history type="bool">true</options.ui.muc.colored-history>
-        <options.ui.save.splitter-state type="QByteArray"></options.ui.save.splitter-state>
-        <options.ui.save.tabs-geometry type="QSize">
-            <width>882</width>
-            <height>810</height>
-        </options.ui.save.tabs-geometry>
-        <options.ui.tabs.show-tab-buttons type="bool">false</options.ui.tabs.show-tab-buttons>
-        <options.ui.tabs.show-tab-close-buttons type="bool">false</options.ui.tabs.show-tab-close-buttons>
-        <options.ui.tabs.use-tabs type="bool">true</options.ui.tabs.use-tabs>
-        <options.ui.contactlist.show.self-contact type="bool">false</options.ui.contactlist.show.self-contact>
-        <options.ui.notifications.passive-popups.css type="QString"></options.ui.notifications.passive-popups.css>
-        <options.ui.contactlist.show-roster-avatar-frame type="bool">false</options.ui.contactlist.show-roster-avatar-frame>
-        <options.ui.tabs.show-tab-icons type="bool">false</options.ui.tabs.show-tab-icons>
-        <options.ui.muc.show-client-icons type="bool">false</options.ui.muc.show-client-icons>
-        <options.ui.contactlist.roster-at-left-when-all-in-one-window type="bool">true</options.ui.contactlist.roster-at-left-when-all-in-one-window>
-        <options.ui.tabs.put-tabs-at-bottom type="bool">false</options.ui.tabs.put-tabs-at-bottom>
-        <options.ui.look.colors.muc.nick-colors type="QStringList">
-            <item>Blue</item>
-            <item>Green</item>
-            <item>Orange</item>
-            <item>Purple</item>
-            <item>Red</item>
-        </options.ui.look.colors.muc.nick-colors>
-        <options.ui.disable-send-button type="bool">true</options.ui.disable-send-button>
-        <options.ui.muc.roster-nick-coloring type="bool">false</options.ui.muc.roster-nick-coloring>
-        <options.ui.contactlist.roster-avatar-frame.avatar.size type="int">52</options.ui.contactlist.roster-avatar-frame.avatar.size>
-        <options.ui.contactlist.roster-avatar-frame.avatar.margin type="int">0</options.ui.contactlist.roster-avatar-frame.avatar.margin>
-        <options.ui.chat.use-small-chats type="bool">false</options.ui.chat.use-small-chats>
-        <options.iconsets.affiliations type="QString">default</options.iconsets.affiliations>
-        <options.ui.chat.scaled-message-icons type="bool">false</options.ui.chat.scaled-message-icons>
-        <options.ui.chat.theme type="QString">psi/classic</options.ui.chat.theme>
-        <options.ui.message.show-character-count type="bool">true</options.ui.message.show-character-count>
-        <options.ui.muc.show-affiliation-icons type="bool">false</options.ui.muc.show-affiliation-icons>
-        <options.ui.muc.show-groups type="bool">true</options.ui.muc.show-groups>

psi-plus-resources-1.tar.xz/sound Deleted

psi-plus-resources-1.tar.xz/sound/attention.wav Deleted

psi-plus-resources-1.tar.xz/sound/chess_error.wav Deleted

psi-plus-resources-1.tar.xz/sound/chess_finish.wav Deleted

psi-plus-resources-1.tar.xz/sound/chess_move.wav Deleted

psi-plus-resources-1.tar.xz/sound/chess_start.wav Deleted

psi-plus-resources-1.tar.xz/sound/email.wav Deleted

psi-plus-resources-1.tar.xz/sound/pepnotify.wav Deleted

psi-plus-resources-1.tar.xz/sound/reminder.wav Deleted

psi-plus-resources-1.tar.xz/sound/watcher.wav Deleted

psi-plus-resources-1.tar.xz/themes Deleted

psi-plus-resources-1.tar.xz/themes/chatview Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/images Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/images/ChatLog.png Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/images/HR.png Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/images/ScrollBarArrowDown.png Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/images/ScrollBarArrowUp.png Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/index.html Deleted

@@ -1,259 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-  <style type="text/css" media="screen,print">
-
-/* скролл-бар*/
-body::-webkit-scrollbar {
-  width:15px;
-  height:15px;}
-
-/* скролл-бар, кнопки перемотки*/
-body::-webkit-scrollbar-button {
-  display: block;
-  width: 15px;
-  height: 15px;}
-
-/* скролл-бар, вверху стрелка вверх*/
-body::-webkit-scrollbar-button:decrement:start {
-	background-color: #012F2F;
-	background-image: url(images/ScrollBarArrowUp.png);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, вверху стрелка вниз*/
-body::-webkit-scrollbar-button:increment:start {
-height: 0px;}
-
-/* скролл-бар, внизу стрелка вверх*/
-body::-webkit-scrollbar-button:decrement:end {
-	background-color: #031C19;
-	background-image: url(images/ScrollBarArrowUp.png);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, внизу стрелка вниз*/
-body::-webkit-scrollbar-button:increment:end {
-	background-color: #031C19;
-	background-image: url(images/ScrollBarArrowDown.png);
-	border: 1px outset #3C7896;
-	border-radius: 3px;
-	padding: 2px;}
-
-/* скролл-бар, ползунок*/
-body::-webkit-scrollbar-thumb {
-	background-color: #072A2C;
-
-	border: 1px outset #3C7896;
-	border-radius: 2px;}
-
-/* скролл-бар, подложка*/
-body::-webkit-scrollbar-track-piece {
-	margin-top: 1px;
-	margin-bottom: 1px;
-	background-color: #012123;
-	border: 1px inset #3C7896;
-	border-radius: 2px;}
-
-body {
-	background: url('images/ChatLog.png') bottom right no-repeat fixed; /* фоновый рисунок чата */
-	background-color: #001415; /* цвет фона чата */
-	margin: 0;
-	width: 100%;
-	height: 100%;
-	border: 0px;
-	padding: 0 0 2px 0;
-	text-shadow: 1px 1px 3px #101010;}
-
-body > div {
-	margin:0px 3px 0px 3px;
-	line-height:1.4em;
-	word-wrap:break-word !important;
-	white-space: pre-wrap !important;
-	overflow:hidden;}
-
-body > div img {
-	vertical-align: bottom;}
-
-body > div > img:first-child {
-	vertical-align: text-bottom;}
-
-.msg { /* обычные сообщения */
-	color: #32C8C3;}
-
-.style_time { /* стиль времени */
-	font-weight: normal;}
-
-.style_nick { /* стиль ника */
-	font-weight: normal;}
-
-.alert {  /* хайлайт */
-	font-weight: bold;
-	color: #9BDCC3;}
-
-.separator { /* разделитель в конференциях */
-	height: 6px;
-	background: url('images/HR.png');
-	border: 0px;}
-
-.sent {}
-
-.received {}
-
-.infmsg { /* информационные сообщения: тема, статусы... */ }
-
-.usertext {}
-
-.nicklink {
-	text-decoration:none;
-	color:inherit;}
-
-  </style>
-
-</head>
-
-<body>
-
-<script type="text/javascript">
-try {
-
-window[chatServer.jsNamespace()].theme = function() {
-	var nicks = {};
-	var nickNumber = 0;
-	var chat = window[chatServer.jsNamespace()];
-	
-	var cssBody = chat.util.findStyleSheet(document.styleSheets[0], "body").style;
-	var cssSentMsg = chat.util.findStyleSheet(document.styleSheets[0], ".sent").style;
-	var cssReceivedMsg = chat.util.findStyleSheet(document.styleSheets[0], ".received").style;
-	var cssInfMsg = chat.util.findStyleSheet(document.styleSheets[0], ".infmsg").style;
-	var cssUserText = chat.util.findStyleSheet(document.styleSheets[0], ".usertext").style;
-	var cssChatSays = chat.util.findStyleSheet(document.styleSheets[0], ".msg>span:first").style;
-	var useMessageIcons, messageIconsSize = 0;
-	
-	var applyPsiSettings = function() {
-		chat.util.updateObject(cssBody, eval("["+shared.session.getFont()+"][0]"));
-		cssBody.color = shared.server.getPaletteColor("Text");
-		cssSentMsg.color = shared.psiOption("options.ui.look.colors.messages.sent");
-		cssReceivedMsg.color = shared.psiOption("options.ui.look.colors.messages.received");
-		cssInfMsg.color = shared.psiOption("options.ui.look.colors.messages.informational");
-		cssUserText.color = shared.psiOption("options.ui.look.colors.messages.usertext");
-		useMessageIcons = shared.psiOption("options.ui.chat.use-message-icons");
-		if (shared.psiOption("options.ui.chat.scaled-message-icons")) {
-			var d = document.createElement("div");
-			d.style.position = "absolute";
-			d.style.top = "-1000;";
-			d.style.visibility = "hidden";
-			d.style.height = "1em";
-			shared.chatElement.appendChild(d);
-			messageIconsSize = parseInt(document.defaultView.getComputedStyle(d, null).height);
-			shared.chatElement.removeChild(d);
-		}
-	}
-	
-	var shared = chat.adapter.initSession();
-	shared.initTheme({
-		chatElement : document.body,
-		scroller : new chat.WindowScroller(true),
-		templates : {
-			message: shared.isMuc?
-				"<div class='msg'>%icon%<span style='color:%nickcolor%'>[%time%] %sender%</span> %message%</div>"
-				: "<div class='msg'>%icon%<span class='%sentrec%'>[%time%] %sender%</span> %message%</div>",
-			messageNC: shared.isMuc?
-				"<div style='color:%nickcolor%'>%icon%[%time%] %sender% %message%</div>"
-				: "<div class='%sentrec%'>%icon%[%time%] %sender% %message%</div>",
-			receivedMessage: shared.isMuc?
-				"<div class='msg'>%icon%<span style='color:%nickcolor%'>[%time%] %sender%</span> %alertedmessage%</div>"
-				: null,
-			spooledMessage: "<div class='infmsg'>%icon%[%time%] %sender% %message%</div>",
-			sys: "<div class='infmsg'>%icon%%message%</div>",
-			sysMessage: "<div class='infmsg'>%icon%[%time%] *** %message%</div>",
-			sysMessageUT: "<div class='infmsg'>%icon%[%time%] *** %message%: <span class='usertext'>%usertext%</span></div>",
-			lastMsgDate: "<div class='infmsg'>%icon%*** %date%</div>",
-			subject: shared.isMuc?
-				"<div class='infmsg'>%icon%[%time%] %message%<div class='usertext'><b>%usertext%</b></div></div>"
-				: "<div class='infmsg'>%icon%<b>*** %usertext%</b></div>",
-			trackbar: '<hr class=\'separator\' />'
-		},
-		dateFormat : "hh:mm:ss",
-		proxy : function() { //optional
-			if (shared.cdata.type == "settings") {
-				applyPsiSettings();
-				return false;
-			} else if (shared.cdata.type == "receipt") {
-				var img = document.getElementById("receipt"+shared.cdata.id);
-				if (img) {
-					var sizeUri = messageIconsSize?"?w="+messageIconsSize+"&h="+messageIconsSize:"";
-					img.src = "icon:psi/notification_chat_delivery_ok"+sizeUri;
-				}
-			}
-			if (shared.cdata.mtype == "message") {
-				var template = shared.cdata.emote && shared.templates.messageNC ||
-					(shared.cdata.spooled && shared.templates.message || null);
-				if (template) {
-					shared.appendHtml(template.toString(), shared.cdata.local?true:null);
-					return false;
-				}
-			}
-		},

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/load.js Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/LunnaCat_Classic/screenshot.png Deleted

psi-plus-resources-1.tar.xz/themes/chatview/psi/new_classic.theme Deleted