[packages/psi-plus] - up to 0.16.447; use upstream tarball; drop all patches (need to be reworked)
arekm
arekm at pld-linux.org
Fri Feb 20 11:27:23 CET 2015
commit bb4d1caf7a75e60a66e3e8d906679b5b4cc3f6c9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Feb 20 11:27:17 2015 +0100
- up to 0.16.447; use upstream tarball; drop all patches (need to be reworked)
generate-tarball.sh | 25 -
psi-plus-appearance-mod.patch | 1232 ----------------------------
psi-plus-build.patch | 40 -
psi-plus-customos.patch | 27 -
psi-plus-empty_group-fix.patch | 23 -
psi-plus-fix_configure_for_ksh.patch | 32 -
psi-plus-icon_buttons_big_return-mod.patch | 15 -
psi-plus.spec | 88 +-
8 files changed, 19 insertions(+), 1463 deletions(-)
---
diff --git a/psi-plus.spec b/psi-plus.spec
index 4a03058..9acb408 100644
--- a/psi-plus.spec
+++ b/psi-plus.spec
@@ -1,40 +1,21 @@
-#
-# TODO: - check BRs
-#
-# NOTE:
-#
-# To generate source package use generate-tarball.sh script included to this spec as SourceX.
-# Requires: git-core, subversion and sed >= 4.0
-#
-%define ver 0.15
-%define rev 4128M
-%define rel 0.%{rev}.1
-#
Summary: PSI - Jabber client
Summary(de.UTF-8): PSI - ein Instant Messaging Client-Programm für Jabber
Summary(pl.UTF-8): PSI - klient Jabbera
Name: psi-plus
-Version: %{ver}.%{rev}
-Release: %{rel}
+Version: 0.16.447
+Release: 1
License: GPL v2+ / LGPL v2.1+
Group: Applications/Communications
-Source0: %{name}-%{version}.tar.xz
-# Source0-md5: 581be6071f50e95a3f87a31874ec8e4f
-Source1: %{name}-lang.tar.bz2
-# Source1-md5: cf6d82f53f1f1600a49bb61ba81151bf
-Source2: generate-tarball.sh
-Patch0: %{name}-fix_configure_for_ksh.patch
-Patch1: %{name}-customos.patch
-Patch2: %{name}-icon_buttons_big_return-mod.patch
-Patch3: %{name}-empty_group-fix.patch
-Patch4: %{name}-build.patch
-URL: http://psi-plus.com/
+Source0: https://github.com/psi-plus/psi-plus-snapshots/archive/%{version}.tar.gz
+# Source0-md5: 9de217db835a622c046d1ab1e9831c90
+URL: https://github.com/psi-plus/psi-plus-snapshots
BuildRequires: Qt3Support-devel
BuildRequires: QtCore-devel
BuildRequires: QtDBus-devel
BuildRequires: QtNetwork-devel
BuildRequires: QtXml-devel
BuildRequires: aspell-devel
+BuildRequires: libidn-devel
BuildRequires: libstdc++-devel
BuildRequires: openssl-devel >= 0.9.7c
BuildRequires: qca-devel >= 2.0.0
@@ -52,7 +33,7 @@ Requires: gstreamer-v4l2
Requires: qt4-plugin-qca-ossl
Suggests: gpgme >= 1.0.0
Provides: psi = %{version}-%{relase}
-Obsoletes: psi < 0.15
+Obsoletes: psi < 0.16
Obsoletes: qt-designer-psiwidgets
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -78,39 +59,30 @@ w katalogu $DATADIR/certs lub ~/.psi/certs.
Psi+ jest rozwojową gałęzią komunikatora Psi IM Jabber.
%prep
-%setup -q -a 1
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-%{__rm} -r third-party
+%setup -q -n %{name}-snapshots-%{version}
%build
./configure \
--prefix=%{_prefix} \
--datadir=%{_datadir} \
--libdir=%{_libdir} \
+ --enable-webkit \
+ --enable-whiteboarding \
+ --enable-plugins \
--no-separate-debug-info
%{__make}
-cd lang
-lrelease-qt4 *.ts
-
%install
rm -rf $RPM_BUILD_ROOT
export QTDIR=%{_libdir}/qt4
-install -d $RPM_BUILD_ROOT%{_libdir}/psi/plugins
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
%{__make} install \
INSTALL_ROOT=$RPM_BUILD_ROOT
-cp -a lang/*.qm $RPM_BUILD_ROOT%{_datadir}/psi/
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -118,34 +90,12 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc README
%attr(755,root,root) %{_bindir}/psi-plus
-%dir %{_datadir}/psi
-%lang(ar) %{_datadir}/psi/*_ar.qm
-%lang(ca) %{_datadir}/psi/*_ca.qm
-%lang(cs) %{_datadir}/psi/*_cs.qm
-%lang(da) %{_datadir}/psi/*_da.qm
-%lang(de) %{_datadir}/psi/*_de.qm
-%lang(el) %{_datadir}/psi/*_el.qm
-%lang(eo) %{_datadir}/psi/*_eo.qm
-%lang(es) %{_datadir}/psi/*_es.qm
-%lang(fi) %{_datadir}/psi/*_fi.qm
-%lang(fr) %{_datadir}/psi/*_fr.qm
-%lang(it) %{_datadir}/psi/*_it.qm
-%lang(jp) %{_datadir}/psi/*_jp.qm
-%lang(mk) %{_datadir}/psi/*_mk.qm
-%lang(nl) %{_datadir}/psi/*_nl.qm
-%lang(pl) %{_datadir}/psi/*_pl.qm
-%lang(pt_BR) %{_datadir}/psi/*_ptbr.qm
-%lang(pt) %{_datadir}/psi/*_pt.qm
-%lang(ru) %{_datadir}/psi/*_ru.qm
-%lang(se) %{_datadir}/psi/*_se.qm
-%lang(sk) %{_datadir}/psi/*_sk.qm
-%lang(sr) %{_datadir}/psi/*_sr.qm
-%lang(uk) %{_datadir}/psi/*_uk.qm
-%lang(zh) %{_datadir}/psi/*_zh.qm
-%dir %{_libdir}/psi
-%dir %{_libdir}/psi/plugins
-%{_datadir}/psi/certs
-%{_datadir}/psi/iconsets
-%{_datadir}/psi/sound
+%dir %{_datadir}/%{name}
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/plugins
+%{_datadir}/%{name}/certs
+%{_datadir}/%{name}/iconsets
+%{_datadir}/%{name}/sound
+%{_datadir}/%{name}/themes
%{_desktopdir}/*.desktop
%{_iconsdir}/hicolor/*/*/*.png
diff --git a/generate-tarball.sh b/generate-tarball.sh
deleted file mode 100644
index caa4a20..0000000
--- a/generate-tarball.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-rm -rf psi
-git clone git://git.psi-im.org/psi.git
-cd psi
-git submodule init
-git submodule update
-git pull
-git submodule update
-svn co http://psi-dev.googlecode.com/svn/trunk/patches/
-# already applied
-rm patches/0005-psi-proxy-settings-in-opt.diff
-for patch in patches/*.diff; do
- echo "* PATCHING WITH $patch"
- cat $patch | patch -p1
-done
-pkgrel=`svnversion "patches"`
-cd src
-sed "s/\(.xxx\)/.${pkgrel}/" -i "applicationinfo.cpp"
-cd ..
-svn co --force http://psi-dev.googlecode.com/svn/trunk/iconsets/ iconsets
-cd ..
-mv psi psi-plus-0.15.${pkgrel}
-tar --exclude .svn --exclude .git -cvJf psi-plus-0.15.${pkgrel}.tar.xz psi-plus-0.15.${pkgrel}
-rm -rf psi-plus-0.15.${pkgrel}
diff --git a/psi-plus-appearance-mod.patch b/psi-plus-appearance-mod.patch
deleted file mode 100644
index 10334f9..0000000
--- a/psi-plus-appearance-mod.patch
+++ /dev/null
@@ -1,1232 +0,0 @@
-diff -urN psi-0.12.orig/options/default.xml psi-0.12/options/default.xml
---- psi-0.12.orig/options/default.xml 2008-05-13 03:57:35.000000000 +0200
-+++ psi-0.12/options/default.xml 2008-08-09 22:01:13.000000000 +0200
-@@ -214,6 +214,12 @@
- <last-used-save-path type="QString"></last-used-save-path>
- <look>
- <colors>
-+ <chat>
-+ <incoming-messages-color type="QColor" >#0000ff</incoming-messages-color>
-+ <outgoing-messages-color type="QColor" >#ff0000</outgoing-messages-color>
-+ <spooled-messages-color type="QColor" >#008000</spooled-messages-color>
-+ <system-messages-color type="QColor" >#00a000</system-messages-color>
-+ </chat>
- <contactlist>
- <background type="QColor">#ffffff</background>
- <grouping>
-@@ -232,6 +238,12 @@
- </status>
- <status-messages type="QColor">#808080</status-messages>
- </contactlist>
-+ <groupchat>
-+ <alert-messages-color type="QColor" >#ff0000</alert-messages-color>
-+ <default-nick-color type="QColor" >#000000</default-nick-color>
-+ <spooled-messages-color type="QColor" >#008000</spooled-messages-color>
-+ <system-messages-color type="QColor" >#00a000</system-messages-color>
-+ </groupchat>
- <muc>
- <nick-colors type="QStringList" >
- <item>Blue</item>
-diff -urN psi-0.12.orig/src/groupchatdlg.cpp psi-0.12/src/groupchatdlg.cpp
---- psi-0.12.orig/src/groupchatdlg.cpp 2008-03-19 21:59:10.000000000 +0100
-+++ psi-0.12/src/groupchatdlg.cpp 2008-08-09 18:34:42.000000000 +0200
-@@ -1207,7 +1207,7 @@
- bool doInsert = t.date() != lastMsgTime_.date();
- lastMsgTime_ = t;
- if (doInsert) {
-- QString color = "#00A000";
-+ QString color = PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.system-messages-color").toString();
- ui_.log->appendText(QString("<font color=\"%1\">*** %2</font>").arg(color).arg(t.date().toString(Qt::ISODate)));
- }
- }
-@@ -1226,7 +1226,7 @@
-
- updateLastMsgTime(time);
- QString timestr = ui_.log->formatTimeStamp(time);
-- ui_.log->appendText(QString("<font color=\"#00A000\">[%1]").arg(timestr) + QString(" *** %1</font>").arg(Qt::escape(str)));
-+ ui_.log->appendText(QString("<font color=\"" + PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.system-messages-color").toString() + "\">[%1]").arg(timestr) + QString(" *** %1</font>").arg(Qt::escape(str)));
-
- if(alert)
- doAlert();
-@@ -1249,7 +1249,7 @@
- QStringList nickColors = PsiOptions::instance()->getOption("options.ui.look.colors.muc.nick-colors").toStringList();
-
- if(!PsiOptions::instance()->getOption("options.ui.muc.use-nick-coloring").toBool() || nickColors.empty()) {
-- return "#000000";
-+ return PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.default-nick-color").toString();
- }
- else if(sender == -1 || nickColors.size() == 1) {
- return nickColors[nickColors.size()-1];
-@@ -1280,12 +1280,12 @@
- nickcolor = getNickColor(who);
- textcolor = ui_.log->palette().active().text().name();
- if(alert) {
-- textcolor = "#FF0000";
-+ textcolor = PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.alert-messages-color").toString();
- alerttagso = "<b>";
- alerttagsc = "</b>";
- }
- if(m.spooled())
-- nickcolor = "#008000"; //color = "#008000";
-+ nickcolor = PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.spooled-messages-color").toString();
-
- QString timestr = ui_.log->formatTimeStamp(m.timeStamp());
-
-diff -urN psi-0.12.orig/src/options/opt_appearance.cpp psi-0.12/src/options/opt_appearance.cpp
---- psi-0.12.orig/src/options/opt_appearance.cpp 2008-01-12 03:48:36.000000000 +0100
-+++ psi-0.12/src/options/opt_appearance.cpp 2008-08-09 21:09:33.000000000 +0200
-@@ -17,6 +17,7 @@
- #include <qlineedit.h>
-
- #include "ui_opt_appearance.h"
-+#include "ui_opt_appearance_fonts.h"
- #include "ui_opt_appearance_misc.h"
- #include "psioptions.h"
-
-@@ -27,6 +28,12 @@
- OptAppearanceUI() : QWidget() { setupUi(this); }
- };
-
-+class OptAppearanceFontsUI : public QWidget, public Ui::OptAppearanceFonts
-+{
-+public:
-+ OptAppearanceFontsUI() : QWidget() { setupUi(this); }
-+};
-+
- class OptAppearanceMiscUI : public QWidget, public Ui::OptAppearanceMisc
- {
- public:
-@@ -72,6 +79,7 @@
- OptionsTabAppearance::OptionsTabAppearance(QObject *parent) : MetaOptionsTab(parent, "appearance", "", tr("Appearance"), tr("Psi's Appearance"), "psi/appearance")
- {
- addTab( new OptionsTabAppearanceGeneral(this) );
-+ addTab( new OptionsTabAppearanceFonts(this) );
- addTab( new OptionsTabIconsetEmoticons(this) );
- addTab( new OptionsTabIconsetRoster(this) );
- addTab( new OptionsTabIconsetSystem(this) );
-@@ -135,21 +143,18 @@
- }
-
- //----------------------------------------------------------------------------
--// OptionsTabAppearanceGeneral: Fonts & Colours
-+// OptionsTabAppearanceGeneral: Colours
- //----------------------------------------------------------------------------
-
- OptionsTabAppearanceGeneral::OptionsTabAppearanceGeneral(QObject *parent)
--: OptionsTab(parent, "appearance_general", "", tr("Fonts && Colors"), tr("Fonts && Color Settings"))
-+: OptionsTab(parent, "appearance_general", "", tr("Colors"), tr("Color Settings"))
- {
- w = 0;
-- bg_font = 0;
- bg_color = 0;
- }
-
- OptionsTabAppearanceGeneral::~OptionsTabAppearanceGeneral()
- {
-- if ( bg_font )
-- delete bg_font;
- if ( bg_color )
- delete bg_color;
- }
-@@ -175,33 +180,6 @@
- w = new OptAppearanceUI();
- OptAppearanceUI *d = (OptAppearanceUI *)w;
-
-- le_font[0] = d->le_fRoster;
-- le_font[1] = d->le_fMessage;
-- le_font[2] = d->le_fChat;
-- le_font[3] = d->le_fPopup;
--
-- bg_font = new QButtonGroup;
-- bg_font->insert(d->pb_fRoster);
-- bg_font->insert(d->pb_fMessage);
-- bg_font->insert(d->pb_fChat);
-- bg_font->insert(d->pb_fPopup);
-- connect(bg_font, SIGNAL(buttonClicked(QAbstractButton*)), SLOT(chooseFont(QAbstractButton*)));
--
-- QWhatsThis::add(le_font[0],
-- tr("Specifies the font style for the main window."));
-- QWhatsThis::add(le_font[1],
-- tr("Specifies the font style for message windows."));
-- QWhatsThis::add(le_font[2],
-- tr("Specifies the font style for chat windows."));
-- QWhatsThis::add(le_font[3],
-- tr("Specifies the font style for popup windows."));
-- QWhatsThis::add(d->pb_fRoster,
-- tr("Selects a font for the roster window using the font selection dialog."));
-- QWhatsThis::add(d->pb_fMessage,
-- tr("Selects a font for message windows using the font selection dialog."));
-- QWhatsThis::add(d->pb_fChat,
-- tr("Selects a font for chat windows using the font selection dialog."));
--
- bg_color = new QButtonGroup;
- bg_color->insert(d->pb_cOnline);
- bg_color->insert(d->pb_cOffline);
-@@ -214,6 +192,15 @@
- bg_color->insert(d->pb_cListBack);
- bg_color->insert(d->pb_cAnimFront);
- bg_color->insert(d->pb_cAnimBack);
-+ bg_color->insert(d->pb_cChatSys);
-+ bg_color->insert(d->pb_cChatSpool);
-+ bg_color->insert(d->pb_cChatTo);
-+ bg_color->insert(d->pb_cChatFrom);
-+ bg_color->insert(d->pb_cGChatAlert);
-+ bg_color->insert(d->pb_cGChatSys);
-+ bg_color->insert(d->pb_cGChatSpool);
-+ bg_color->insert(d->pb_cGChatNick);
-+
- bg_color->insert(d->pb_cStatus);
- connect(bg_color, SIGNAL(buttonClicked(QAbstractButton*)), SLOT(chooseColor(QAbstractButton*)));
-
-@@ -238,6 +225,22 @@
- tr("Specifies the foreground animation color for nicks."));
- QWhatsThis::add(d->pb_cAnimBack,
- tr("Specifies the background animation color for nicks."));
-+ QWhatsThis::add(d->pb_cChatSys,
-+ tr("Specifies the color for system chat messages."));
-+ QWhatsThis::add(d->pb_cChatSpool,
-+ tr("Specifies the color for spooled chat messages."));
-+ QWhatsThis::add(d->pb_cChatTo,
-+ tr("Specifies the nick color for sent chat messages."));
-+ QWhatsThis::add(d->pb_cChatFrom,
-+ tr("Specifies the nick color for recieved chat messages."));
-+ QWhatsThis::add(d->pb_cGChatAlert,
-+ tr("Specifies the color for alert groupchat messages."));
-+ QWhatsThis::add(d->pb_cGChatSys,
-+ tr("Specifies the color for system groupchat messages."));
-+ QWhatsThis::add(d->pb_cGChatSpool,
-+ tr("Specifies the color for spooled groupchat messages."));
-+ QWhatsThis::add(d->pb_cGChatNick,
-+ tr("Specifies the default nick color for groupchat messages."));
-
- // Avatars
- //QWhatsThis::add(d->ck_avatarsChatdlg,
-@@ -265,11 +268,6 @@
- OptAppearanceUI *d = (OptAppearanceUI *)w;
- //LEGOPTS.avatarsChatdlgEnabled = d->ck_avatarsChatdlg->isChecked(); // Avatars
-
-- PsiOptions::instance()->setOption("options.ui.look.font.contactlist", d->le_fRoster->fontName());
-- PsiOptions::instance()->setOption("options.ui.look.font.message", d->le_fMessage->fontName());
-- PsiOptions::instance()->setOption("options.ui.look.font.chat", d->le_fChat->fontName());
-- PsiOptions::instance()->setOption("options.ui.look.font.passive-popup", d->le_fPopup->fontName());
--
- PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.status.online", getColor(d->pb_cOnline));
- PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.status.offline", getColor(d->pb_cOffline));
- PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.status.away", getColor(d->pb_cAway));
-@@ -281,6 +279,14 @@
- PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.background", getColor(d->pb_cListBack));
- PsiOptions::instance()->setOption("options.ui.look.contactlist.status-change-animation.color1", getColor(d->pb_cAnimFront));
- PsiOptions::instance()->setOption("options.ui.look.contactlist.status-change-animation.color2", getColor(d->pb_cAnimBack));
-+ PsiOptions::instance()->setOption("options.ui.look.colors.chat.system-messages-color", getColor(d->pb_cChatSys));
-+ PsiOptions::instance()->setOption("options.ui.look.colors.chat.spooled-messages-color", getColor(d->pb_cChatSpool));
-+ PsiOptions::instance()->setOption("options.ui.look.colors.chat.outgoing-messages-color", getColor(d->pb_cChatTo));
-+ PsiOptions::instance()->setOption("options.ui.look.colors.chat.incoming-messages-color", getColor(d->pb_cChatFrom));
-+ PsiOptions::instance()->setOption("options.ui.look.colors.groupchat.alert-messages-color", getColor(d->pb_cGChatAlert));
-+ PsiOptions::instance()->setOption("options.ui.look.colors.groupchat.system-messages-color", getColor(d->pb_cGChatSys));
-+ PsiOptions::instance()->setOption("options.ui.look.colors.groupchat.spooled-messages-color", getColor(d->pb_cGChatSpool));
-+ PsiOptions::instance()->setOption("options.ui.look.colors.groupchat.default-nick-color", getColor(d->pb_cGChatNick));
- PsiOptions::instance()->setOption("options.ui.look.colors.contactlist.status-messages", getColor(d->pb_cStatus));
- }
-
-@@ -298,11 +304,6 @@
- OptAppearanceUI *d = (OptAppearanceUI *)w;
- //d->ck_avatarsChatdlg->setChecked( LEGOPTS.avatarsChatdlgEnabled ); // Avatars
-
-- d->le_fRoster->setFont(PsiOptions::instance()->getOption("options.ui.look.font.contactlist").toString());
-- d->le_fMessage->setFont(PsiOptions::instance()->getOption("options.ui.look.font.message").toString());
-- d->le_fChat->setFont(PsiOptions::instance()->getOption("options.ui.look.font.chat").toString());
-- d->le_fPopup->setFont(PsiOptions::instance()->getOption("options.ui.look.font.passive-popup").toString());
--
- restoreColor(d->pb_cOnline, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.online").value<QColor>());
- restoreColor(d->pb_cOffline, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.offline").value<QColor>());
- restoreColor(d->pb_cAway, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status.away").value<QColor>());
-@@ -314,6 +315,14 @@
- restoreColor(d->pb_cListBack, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.background").value<QColor>());
- restoreColor(d->pb_cAnimFront, PsiOptions::instance()->getOption("options.ui.look.contactlist.status-change-animation.color1").value<QColor>());
- restoreColor(d->pb_cAnimBack, PsiOptions::instance()->getOption("options.ui.look.contactlist.status-change-animation.color2").value<QColor>());
-+ restoreColor(d->pb_cChatSys, PsiOptions::instance()->getOption("options.ui.look.colors.chat.system-messages-color").value<QColor>());
-+ restoreColor(d->pb_cChatSpool, PsiOptions::instance()->getOption("options.ui.look.colors.chat.spooled-messages-color").value<QColor>());
-+ restoreColor(d->pb_cChatTo, PsiOptions::instance()->getOption("options.ui.look.colors.chat.outgoing-messages-color").value<QColor>());
-+ restoreColor(d->pb_cChatFrom, PsiOptions::instance()->getOption("options.ui.look.colors.chat.incoming-messages-color").value<QColor>());
-+ restoreColor(d->pb_cGChatAlert, PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.alert-messages-color").value<QColor>());
-+ restoreColor(d->pb_cGChatSys, PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.system-messages-color").value<QColor>());
-+ restoreColor(d->pb_cGChatSpool, PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.spooled-messages-color").value<QColor>());
-+ restoreColor(d->pb_cGChatNick, PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.default-nick-color").value<QColor>());
- restoreColor(d->pb_cStatus, PsiOptions::instance()->getOption("options.ui.look.colors.contactlist.status-messages").value<QColor>());
- }
-
-@@ -331,26 +331,6 @@
- parentWidget = parentDialog;
- }
-
--void OptionsTabAppearanceGeneral::chooseFont(QAbstractButton* button)
--{
-- bool ok;
-- QFont font;
-- int x = (bg_font->buttons()).indexOf(button);
-- font.fromString( le_font[x]->fontName() );
--
-- // ensure we don't use the new native font dialog on mac with Qt 4.5,
-- // since it was broken last we checked (qt task #252000)
--#if QT_VERSION >= 0x040500
-- QString fnt = QFontDialog::getFont(&ok, font, parentWidget, QString(), QFontDialog::DontUseNativeDialog).toString();
--#else
-- QString fnt = QFontDialog::getFont(&ok, font, parentWidget).toString();
--#endif
-- le_font[x]->setFont(fnt);
--
-- if(ok)
-- emit dataChanged();
--}
--
- void OptionsTabAppearanceGeneral::chooseColor(QAbstractButton* button)
- {
- QColor c;
-@@ -352,3 +347,106 @@
- emit dataChanged();
- }
- }
-+
-+//----------------------------------------------------------------------------
-+// OptionsTabAppearanceFonts: Fonts
-+//----------------------------------------------------------------------------
-+
-+OptionsTabAppearanceFonts::OptionsTabAppearanceFonts(QObject *parent)
-+: OptionsTab(parent, "appearance_general", "", tr("Fonts"), tr("Fonts"))
-+{
-+ w = 0;
-+ bg_font = 0;
-+}
-+
-+OptionsTabAppearanceFonts::~OptionsTabAppearanceFonts()
-+{
-+ if ( bg_font )
-+ delete bg_font;
-+}
-+
-+QWidget *OptionsTabAppearanceFonts::widget()
-+{
-+ if ( w )
-+ return 0;
-+
-+ w = new OptAppearanceFontsUI();
-+ OptAppearanceFontsUI *d = (OptAppearanceFontsUI *)w;
-+
-+ le_font[0] = d->le_fRoster;
-+ le_font[1] = d->le_fMessage;
-+ le_font[2] = d->le_fChat;
-+ le_font[3] = d->le_fPopup;
-+
-+ bg_font = new QButtonGroup;
-+ bg_font->insert(d->pb_fRoster);
-+ bg_font->insert(d->pb_fMessage);
-+ bg_font->insert(d->pb_fChat);
-+ bg_font->insert(d->pb_fPopup);
-+ connect(bg_font, SIGNAL(buttonClicked(QAbstractButton*)), SLOT(chooseFont(QAbstractButton*)));
-+
-+ QWhatsThis::add(le_font[0],
-+ tr("Specifies the font style for the main window."));
-+ QWhatsThis::add(le_font[1],
-+ tr("Specifies the font style for message windows."));
-+ QWhatsThis::add(le_font[2],
-+ tr("Specifies the font style for chat windows."));
-+ QWhatsThis::add(le_font[3],
-+ tr("Specifies the font style for popup windows."));
-+ QWhatsThis::add(d->pb_fRoster,
-+ tr("Selects a font for the roster window using the font selection dialog."));
-+ QWhatsThis::add(d->pb_fMessage,
-+ tr("Selects a font for message windows using the font selection dialog."));
-+ QWhatsThis::add(d->pb_fChat,
-+ tr("Selects a font for chat windows using the font selection dialog."));
-+
-+ return w;
-+}
-+
-+
-+void OptionsTabAppearanceFonts::applyOptions()
-+{
-+ if ( !w )
-+ return;
-+
-+ OptAppearanceFontsUI *d = (OptAppearanceFontsUI *)w;
-+ //LEGOPTS.avatarsChatdlgEnabled = d->ck_avatarsChatdlg->isChecked(); // Avatars
-+
-+ PsiOptions::instance()->setOption("options.ui.look.font.contactlist", d->le_fRoster->fontName());
-+ PsiOptions::instance()->setOption("options.ui.look.font.message", d->le_fMessage->fontName());
-+ PsiOptions::instance()->setOption("options.ui.look.font.chat", d->le_fChat->fontName());
-+ PsiOptions::instance()->setOption("options.ui.look.font.passive-popup", d->le_fPopup->fontName());
-+}
-+
-+void OptionsTabAppearanceFonts::restoreOptions()
-+{
-+ if ( !w )
-+ return;
-+
-+ OptAppearanceFontsUI *d = (OptAppearanceFontsUI *)w;
-+ //d->ck_avatarsChatdlg->setChecked( LEGOPTS.avatarsChatdlgEnabled ); // Avatars
-+
-+ d->le_fRoster->setFont(PsiOptions::instance()->getOption("options.ui.look.font.contactlist").toString());
-+ d->le_fMessage->setFont(PsiOptions::instance()->getOption("options.ui.look.font.message").toString());
-+ d->le_fChat->setFont(PsiOptions::instance()->getOption("options.ui.look.font.chat").toString());
-+ d->le_fPopup->setFont(PsiOptions::instance()->getOption("options.ui.look.font.passive-popup").toString());
-+}
-+
-+void OptionsTabAppearanceFonts::setData(PsiCon *, QWidget *parentDialog)
-+{
-+ parentWidget = parentDialog;
-+}
-+
-+void OptionsTabAppearanceFonts::chooseFont(QAbstractButton* button)
-+{
-+ bool ok;
-+ QFont font;
-+ int x = (bg_font->buttons()).indexOf(button);
-+ font.fromString( le_font[x]->fontName() );
-+
-+ QString fnt = QFontDialog::getFont(&ok, font, parentWidget).toString();
-+ le_font[x]->setFont(fnt);
-+
-+ if(ok)
-+ emit dataChanged();
-+}
-diff -urN psi-0.12.orig/src/options/opt_appearance_fonts.ui psi-0.12/src/options/opt_appearance_fonts.ui
---- psi-0.12.orig/src/options/opt_appearance_fonts.ui 1970-01-01 01:00:00.000000000 +0100
-+++ psi-0.12/src/options/opt_appearance_fonts.ui 2008-08-09 18:34:42.000000000 +0200
-@@ -0,0 +1,142 @@
-+<ui version="4.0" >
-+ <author></author>
-+ <comment></comment>
-+ <exportmacro></exportmacro>
-+ <class>OptAppearanceFonts</class>
-+ <widget class="QWidget" name="OptAppearanceFonts" >
-+ <property name="geometry" >
-+ <rect>
-+ <x>0</x>
-+ <y>0</y>
-+ <width>402</width>
-+ <height>184</height>
-+ </rect>
-+ </property>
-+ <property name="windowTitle" >
-+ <string>OptAppearanceFontsUI</string>
-+ </property>
-+ <layout class="QVBoxLayout" >
-+ <property name="margin" >
-+ <number>9</number>
-+ </property>
-+ <property name="spacing" >
-+ <number>6</number>
-+ </property>
-+ <item>
-+ <widget class="QGroupBox" name="groupBox12" >
-+ <property name="title" >
-+ <string>Fonts</string>
-+ </property>
-+ <layout class="QGridLayout" >
-+ <property name="margin" >
-+ <number>8</number>
-+ </property>
-+ <property name="spacing" >
-+ <number>6</number>
-+ </property>
-+ <item row="0" column="0" >
-+ <widget class="QLabel" name="tl_fRoster" >
-+ <property name="text" >
-+ <string>Roster</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="1" column="0" >
-+ <widget class="QLabel" name="tl_fMessage" >
-+ <property name="text" >
-+ <string>Message</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="2" column="0" >
-+ <widget class="QLabel" name="tl_fChat" >
-+ <property name="enabled" >
-+ <bool>true</bool>
-+ </property>
-+ <property name="text" >
-+ <string>Chat</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="3" column="0" >
-+ <widget class="QLabel" name="tl_fPopup" >
-+ <property name="text" >
-+ <string>Popup</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="0" column="1" colspan="3" >
-+ <widget class="FontLabel" name="le_fRoster" />
-+ </item>
-+ <item row="1" column="1" colspan="3" >
-+ <widget class="FontLabel" name="le_fMessage" />
-+ </item>
-+ <item row="2" column="1" colspan="3" >
-+ <widget class="FontLabel" name="le_fChat" />
-+ </item>
-+ <item row="3" column="1" colspan="3" >
-+ <widget class="FontLabel" name="le_fPopup" />
-+ </item>
-+ <item row="0" column="4" >
-+ <widget class="QPushButton" name="pb_fRoster" >
-+ <property name="text" >
-+ <string>Choose</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="1" column="4" >
-+ <widget class="QPushButton" name="pb_fMessage" >
-+ <property name="text" >
-+ <string>Choose</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="2" column="4" >
-+ <widget class="QPushButton" name="pb_fChat" >
-+ <property name="enabled" >
-+ <bool>true</bool>
-+ </property>
-+ <property name="text" >
-+ <string>Choose</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="3" column="4" >
-+ <widget class="QPushButton" name="pb_fPopup" >
-+ <property name="enabled" >
-+ <bool>true</bool>
-+ </property>
-+ <property name="text" >
-+ <string>Choose</string>
-+ </property>
-+ </widget>
-+ </item>
-+ </layout>
-+ </widget>
-+ </item>
-+ </layout>
-+ </widget>
-+ <layoutdefault spacing="6" margin="11" />
-+ <pixmapfunction></pixmapfunction>
-+ <customwidgets>
-+ <customwidget>
-+ <class>FontLabel</class>
-+ <extends></extends>
-+ <header>opt_appearance.h</header>
-+ <container>0</container>
-+ <pixmap></pixmap>
-+ </customwidget>
-+ </customwidgets>
-+ <tabstops>
-+ <tabstop>le_fRoster</tabstop>
-+ <tabstop>pb_fRoster</tabstop>
-+ <tabstop>le_fMessage</tabstop>
-+ <tabstop>pb_fMessage</tabstop>
-+ <tabstop>le_fChat</tabstop>
-+ <tabstop>pb_fChat</tabstop>
-+ <tabstop>le_fPopup</tabstop>
-+ <tabstop>pb_fPopup</tabstop>
-+ </tabstops>
-+ <resources/>
-+ <connections/>
-+</ui>
-diff -urN psi-0.12.orig/src/options/opt_appearance.h psi-0.12/src/options/opt_appearance.h
---- psi-0.12.orig/src/options/opt_appearance.h 2008-01-12 01:45:25.000000000 +0100
-+++ psi-0.12/src/options/opt_appearance.h 2008-08-09 18:34:42.000000000 +0200
-@@ -65,11 +65,29 @@
- private slots:
- void setData(PsiCon *, QWidget *);
- void chooseColor(QAbstractButton* button);
-- void chooseFont(QAbstractButton* button);
-
- private:
- QWidget *w, *parentWidget;
- QButtonGroup *bg_color;
-+};
-+
-+class OptionsTabAppearanceFonts : public OptionsTab
-+{
-+ Q_OBJECT
-+public:
-+ OptionsTabAppearanceFonts(QObject *parent);
-+ ~OptionsTabAppearanceFonts();
-+
-+ QWidget *widget();
-+ void applyOptions();
-+ void restoreOptions();
-+
-+private slots:
-+ void setData(PsiCon *, QWidget *);
-+ void chooseFont(QAbstractButton* button);
-+
-+private:
-+ QWidget *w, *parentWidget;
- FontLabel *le_font[4];
- QButtonGroup *bg_font;
- };
-diff -urN psi-0.12.orig/src/options/opt_appearance.ui psi-0.12/src/options/opt_appearance.ui
---- psi-0.12.orig/src/options/opt_appearance.ui 2007-05-07 20:00:07.000000000 +0200
-+++ psi-0.12/src/options/opt_appearance.ui 2008-08-09 18:34:42.000000000 +0200
-@@ -8,8 +8,8 @@
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>402</width>
-- <height>333</height>
-+ <width>474</width>
-+ <height>310</height>
- </rect>
- </property>
- <property name="windowTitle" >
-@@ -34,63 +34,99 @@
- <property name="spacing" >
- <number>6</number>
- </property>
-- <item row="0" column="3" >
-+ <item row="0" column="0" >
-+ <widget class="QLabel" name="tl_cProfileFore" >
-+ <property name="text" >
-+ <string>Account heading foreground:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="1" column="0" >
-+ <widget class="QLabel" name="tl_cProfileBack" >
-+ <property name="text" >
-+ <string>Account heading background:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="2" column="0" >
-+ <widget class="QLabel" name="tl_cGroupFore" >
-+ <property name="text" >
-+ <string>Group heading foreground:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="3" column="0" >
-+ <widget class="QLabel" name="tl_cGroupBack" >
-+ <property name="text" >
-+ <string>Group heading background:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="4" column="0" >
-+ <widget class="QLabel" name="tl_cAnimFront" >
-+ <property name="text" >
-+ <string>Nick animation foreground</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="5" column="0" >
-+ <widget class="QLabel" name="tl_cAnimBack" >
-+ <property name="text" >
-+ <string>Nick animation background:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="6" column="0" >
- <widget class="QLabel" name="tl_cOnline" >
- <property name="text" >
- <string>Online contacts:</string>
- </property>
- </widget>
- </item>
-- <item row="1" column="3" >
-+ <item row="7" column="0" >
- <widget class="QLabel" name="TextLabel1_2" >
- <property name="text" >
- <string>Away contacts:</string>
- </property>
- </widget>
- </item>
-- <item row="2" column="3" >
-+ <item row="8" column="0" >
- <widget class="QLabel" name="tl_cDND" >
- <property name="text" >
- <string>DND contacts:</string>
- </property>
- </widget>
- </item>
-- <item row="3" column="3" >
-+ <item row="9" column="0" >
- <widget class="QLabel" name="tl_cOffline" >
- <property name="text" >
- <string>Offline contacts:</string>
- </property>
- </widget>
- </item>
-- <item row="3" column="2" >
-- <spacer>
-- <property name="orientation" >
-- <enum>Qt::Horizontal</enum>
-+ <item row="0" column="1" >
-+ <widget class="QToolButton" name="pb_cProfileFore" >
-+ <property name="sizePolicy" >
-+ <sizepolicy>
-+ <hsizetype>0</hsizetype>
-+ <vsizetype>0</vsizetype>
-+ <horstretch>0</horstretch>
-+ <verstretch>0</verstretch>
-+ </sizepolicy>
- </property>
-- <property name="sizeHint" >
-+ <property name="maximumSize" >
- <size>
-- <width>111</width>
-+ <width>20</width>
- <height>20</height>
- </size>
- </property>
-- </spacer>
-- </item>
-- <item row="4" column="3" >
-- <widget class="QLabel" name="tl_cListBack" >
-- <property name="text" >
-- <string>Contact list background:</string>
-- </property>
-- </widget>
-- </item>
-- <item row="5" column="3" >
-- <widget class="QLabel" name="tl_cStatus" >
- <property name="text" >
-- <string>Status messages:</string>
-+ <string/>
- </property>
- </widget>
- </item>
-- <item row="0" column="4" >
-- <widget class="QToolButton" name="pb_cOnline" >
-+ <item row="1" column="1" >
-+ <widget class="QToolButton" name="pb_cProfileBack" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -110,8 +146,8 @@
- </property>
- </widget>
- </item>
-- <item row="1" column="4" >
-- <widget class="QToolButton" name="pb_cAway" >
-+ <item row="2" column="1" >
-+ <widget class="QToolButton" name="pb_cGroupFore" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -131,22 +167,29 @@
- </property>
- </widget>
- </item>
-- <item row="1" column="0" >
-- <widget class="QLabel" name="tl_cProfileBack" >
-- <property name="text" >
-- <string>Account heading background:</string>
-+ <item row="3" column="1" >
-+ <widget class="QToolButton" name="pb_cGroupBack" >
-+ <property name="sizePolicy" >
-+ <sizepolicy>
-+ <hsizetype>0</hsizetype>
-+ <vsizetype>0</vsizetype>
-+ <horstretch>0</horstretch>
-+ <verstretch>0</verstretch>
-+ </sizepolicy>
-+ </property>
-+ <property name="maximumSize" >
-+ <size>
-+ <width>20</width>
-+ <height>20</height>
-+ </size>
- </property>
-- </widget>
-- </item>
-- <item row="3" column="0" >
-- <widget class="QLabel" name="tl_cGroupBack" >
- <property name="text" >
-- <string>Group heading background:</string>
-+ <string/>
- </property>
- </widget>
- </item>
-- <item row="5" column="1" >
-- <widget class="QToolButton" name="pb_cAnimBack" >
-+ <item row="4" column="1" >
-+ <widget class="QToolButton" name="pb_cAnimFront" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -166,8 +209,8 @@
- </property>
- </widget>
- </item>
-- <item row="1" column="1" >
-- <widget class="QToolButton" name="pb_cProfileBack" >
-+ <item row="5" column="1" >
-+ <widget class="QToolButton" name="pb_cAnimBack" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -187,8 +230,8 @@
- </property>
- </widget>
- </item>
-- <item row="3" column="1" >
-- <widget class="QToolButton" name="pb_cGroupBack" >
-+ <item row="6" column="1" >
-+ <widget class="QToolButton" name="pb_cOnline" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -208,8 +251,8 @@
- </property>
- </widget>
- </item>
-- <item row="0" column="1" >
-- <widget class="QToolButton" name="pb_cProfileFore" >
-+ <item row="7" column="1" >
-+ <widget class="QToolButton" name="pb_cAway" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -229,8 +272,8 @@
- </property>
- </widget>
- </item>
-- <item row="2" column="1" >
-- <widget class="QToolButton" name="pb_cGroupFore" >
-+ <item row="8" column="1" >
-+ <widget class="QToolButton" name="pb_cDND" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -250,8 +293,8 @@
- </property>
- </widget>
- </item>
-- <item row="4" column="1" >
-- <widget class="QToolButton" name="pb_cAnimFront" >
-+ <item row="9" column="1" >
-+ <widget class="QToolButton" name="pb_cOffline" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -271,36 +314,91 @@
- </property>
- </widget>
- </item>
-- <item row="4" column="0" >
-- <widget class="QLabel" name="tl_cAnimFront" >
-+ <item row="3" column="2" >
-+ <spacer>
-+ <property name="orientation" >
-+ <enum>Qt::Horizontal</enum>
-+ </property>
-+ <property name="sizeHint" >
-+ <size>
-+ <width>111</width>
-+ <height>20</height>
-+ </size>
-+ </property>
-+ </spacer>
-+ </item>
-+ <item row="0" column="3" >
-+ <widget class="QLabel" name="tl_cListBack" >
- <property name="text" >
-- <string>Nick animation foreground:</string>
-+ <string>Contact list background:</string>
- </property>
- </widget>
- </item>
-- <item row="5" column="0" >
-- <widget class="QLabel" name="tl_cAnimBack" >
-+ <item row="1" column="3" >
-+ <widget class="QLabel" name="tl_cStatus" >
- <property name="text" >
-- <string>Nick animation background:</string>
-+ <string>Status messages:</string>
- </property>
- </widget>
- </item>
-- <item row="0" column="0" >
-- <widget class="QLabel" name="tl_cProfileFore" >
-+ <item row="2" column="3" >
-+ <widget class="QLabel" name="tl_cChatSys" >
- <property name="text" >
-- <string>Account heading foreground:</string>
-+ <string>System chat messages:</string>
- </property>
- </widget>
- </item>
-- <item row="2" column="0" >
-- <widget class="QLabel" name="tl_cGroupFore" >
-+ <item row="3" column="3" >
-+ <widget class="QLabel" name="tl_cChatSpool" >
- <property name="text" >
-- <string>Group heading foreground:</string>
-+ <string>Spooled chat messages:</string>
- </property>
- </widget>
- </item>
-- <item row="2" column="4" >
-- <widget class="QToolButton" name="pb_cDND" >
-+ <item row="4" column="3" >
-+ <widget class="QLabel" name="tl_cChatTo" >
-+ <property name="text" >
-+ <string>Outgoing chat message nick:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="5" column="3" >
-+ <widget class="QLabel" name="tl_cChatFrom" >
-+ <property name="text" >
-+ <string>Incoming chat message nick:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="6" column="3" >
-+ <widget class="QLabel" name="tl_cGChatAler" >
-+ <property name="text" >
-+ <string>Groupchat alert messages:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="7" column="3" >
-+ <widget class="QLabel" name="tl_cGChatSys" >
-+ <property name="text" >
-+ <string>Groupchat system messages:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="8" column="3" >
-+ <widget class="QLabel" name="tl_cGChatSpool" >
-+ <property name="text" >
-+ <string>Groupchat spooled messages:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="9" column="3" >
-+ <widget class="QLabel" name="tl_cGChatNick" >
-+ <property name="text" >
-+ <string>Groupchat non-colored nicks:</string>
-+ </property>
-+ </widget>
-+ </item>
-+ <item row="0" column="4" >
-+ <widget class="QToolButton" name="pb_cListBack" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -320,8 +418,8 @@
- </property>
- </widget>
- </item>
-- <item row="3" column="4" >
-- <widget class="QToolButton" name="pb_cOffline" >
-+ <item row="1" column="4" >
-+ <widget class="QToolButton" name="pb_cStatus" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -341,8 +439,8 @@
- </property>
- </widget>
- </item>
-- <item row="4" column="4" >
-- <widget class="QToolButton" name="pb_cListBack" >
-+ <item row="2" column="4" >
-+ <widget class="QToolButton" name="pb_cChatSys" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -362,8 +460,8 @@
- </property>
- </widget>
- </item>
-- <item row="5" column="4" >
-- <widget class="QToolButton" name="pb_cStatus" >
-+ <item row="3" column="4" >
-+ <widget class="QToolButton" name="pb_cChatSpool" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
-@@ -383,98 +481,132 @@
- </property>
- </widget>
- </item>
-- </layout>
-- </widget>
-- </item>
-- <item>
-- <widget class="QGroupBox" name="groupBox12" >
-- <property name="title" >
-- <string>Fonts</string>
-- </property>
-- <layout class="QGridLayout" >
-- <property name="margin" >
-- <number>8</number>
-- </property>
-- <property name="spacing" >
-- <number>6</number>
-- </property>
-- <item row="2" column="1" colspan="3" >
-- <widget class="FontLabel" name="le_fChat" />
-- </item>
-- <item row="2" column="0" >
-- <widget class="QLabel" name="tl_fChat" >
-- <property name="enabled" >
-- <bool>true</bool>
-+ <item row="4" column="4" >
-+ <widget class="QToolButton" name="pb_cChatTo" >
-+ <property name="sizePolicy" >
-+ <sizepolicy>
-+ <hsizetype>0</hsizetype>
-+ <vsizetype>0</vsizetype>
-+ <horstretch>0</horstretch>
-+ <verstretch>0</verstretch>
-+ </sizepolicy>
- </property>
-- <property name="text" >
-- <string>Chat:</string>
-+ <property name="maximumSize" >
-+ <size>
-+ <width>20</width>
-+ <height>20</height>
-+ </size>
- </property>
-- </widget>
-- </item>
-- <item row="1" column="0" >
-- <widget class="QLabel" name="tl_fMessage" >
- <property name="text" >
-- <string>Message:</string>
-+ <string/>
- </property>
- </widget>
- </item>
-- <item row="1" column="4" >
-- <widget class="QPushButton" name="pb_fMessage" >
-- <property name="text" >
-- <string>Choose...</string>
-+ <item row="5" column="4" >
-+ <widget class="QToolButton" name="pb_cChatFrom" >
-+ <property name="sizePolicy" >
-+ <sizepolicy>
-+ <hsizetype>0</hsizetype>
-+ <vsizetype>0</vsizetype>
-+ <horstretch>0</horstretch>
-+ <verstretch>0</verstretch>
-+ </sizepolicy>
- </property>
-- </widget>
-- </item>
-- <item row="2" column="4" >
-- <widget class="QPushButton" name="pb_fChat" >
-- <property name="enabled" >
-- <bool>true</bool>
-+ <property name="maximumSize" >
-+ <size>
-+ <width>20</width>
-+ <height>20</height>
-+ </size>
- </property>
- <property name="text" >
-- <string>Choose...</string>
-+ <string/>
- </property>
- </widget>
- </item>
-- <item row="3" column="4" >
-- <widget class="QPushButton" name="pb_fPopup" >
-- <property name="enabled" >
-- <bool>true</bool>
-+ <item row="6" column="4" >
-+ <widget class="QToolButton" name="pb_cGChatAlert" >
-+ <property name="sizePolicy" >
-+ <sizepolicy>
-+ <hsizetype>0</hsizetype>
-+ <vsizetype>0</vsizetype>
-+ <horstretch>0</horstretch>
-+ <verstretch>0</verstretch>
-+ </sizepolicy>
-+ </property>
-+ <property name="maximumSize" >
-+ <size>
-+ <width>20</width>
-+ <height>20</height>
-+ </size>
- </property>
- <property name="text" >
-- <string>Choose...</string>
-+ <string/>
- </property>
- </widget>
- </item>
-- <item row="0" column="4" >
-- <widget class="QPushButton" name="pb_fRoster" >
-+ <item row="7" column="4" >
-+ <widget class="QToolButton" name="pb_cGChatSys" >
-+ <property name="sizePolicy" >
-+ <sizepolicy>
-+ <hsizetype>0</hsizetype>
-+ <vsizetype>0</vsizetype>
-+ <horstretch>0</horstretch>
-+ <verstretch>0</verstretch>
-+ </sizepolicy>
-+ </property>
-+ <property name="maximumSize" >
-+ <size>
-+ <width>20</width>
-+ <height>20</height>
-+ </size>
-+ </property>
- <property name="text" >
-- <string>Choose...</string>
-+ <string/>
- </property>
- </widget>
- </item>
-- <item row="0" column="0" >
-- <widget class="QLabel" name="tl_fRoster" >
-+ <item row="8" column="4" >
-+ <widget class="QToolButton" name="pb_cGChatSpool" >
-+ <property name="sizePolicy" >
-+ <sizepolicy>
-+ <hsizetype>0</hsizetype>
-+ <vsizetype>0</vsizetype>
-+ <horstretch>0</horstretch>
-+ <verstretch>0</verstretch>
-+ </sizepolicy>
-+ </property>
-+ <property name="maximumSize" >
-+ <size>
-+ <width>20</width>
-+ <height>20</height>
-+ </size>
-+ </property>
- <property name="text" >
-- <string>Roster:</string>
-+ <string/>
- </property>
- </widget>
- </item>
-- <item row="3" column="0" >
-- <widget class="QLabel" name="tl_fPopup" >
-+ <item row="9" column="4" >
-+ <widget class="QToolButton" name="pb_cGChatNick" >
-+ <property name="sizePolicy" >
-+ <sizepolicy>
-+ <hsizetype>0</hsizetype>
-+ <vsizetype>0</vsizetype>
-+ <horstretch>0</horstretch>
-+ <verstretch>0</verstretch>
-+ </sizepolicy>
-+ </property>
-+ <property name="maximumSize" >
-+ <size>
-+ <width>20</width>
-+ <height>20</height>
-+ </size>
-+ </property>
- <property name="text" >
-- <string>Popup:</string>
-+ <string/>
- </property>
- </widget>
- </item>
-- <item row="3" column="1" colspan="3" >
-- <widget class="FontLabel" name="le_fPopup" />
-- </item>
-- <item row="1" column="1" colspan="3" >
-- <widget class="FontLabel" name="le_fMessage" />
-- </item>
-- <item row="0" column="1" colspan="3" >
-- <widget class="FontLabel" name="le_fRoster" />
-- </item>
- </layout>
- </widget>
- </item>
-@@ -504,14 +636,6 @@
- <tabstop>pb_cOffline</tabstop>
- <tabstop>pb_cListBack</tabstop>
- <tabstop>pb_cStatus</tabstop>
-- <tabstop>le_fRoster</tabstop>
-- <tabstop>pb_fRoster</tabstop>
-- <tabstop>le_fMessage</tabstop>
-- <tabstop>pb_fMessage</tabstop>
-- <tabstop>le_fChat</tabstop>
-- <tabstop>pb_fChat</tabstop>
-- <tabstop>le_fPopup</tabstop>
-- <tabstop>pb_fPopup</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-diff -urN psi-0.12.orig/src/options/options.pri psi-0.12/src/options/options.pri
---- psi-0.12.orig/src/options/options.pri 2008-02-11 23:24:22.000000000 +0100
-+++ psi-0.12/src/options/options.pri 2008-08-09 18:34:42.000000000 +0200
-@@ -46,6 +46,7 @@
- $$PWD/opt_events.ui \
- $$PWD/opt_status.ui \
- $$PWD/opt_appearance.ui \
-+ $$PWD/opt_appearance_fonts.ui \
- $$PWD/opt_appearance_misc.ui \
- $$PWD/opt_sound.ui \
- $$PWD/opt_advanced.ui \
-diff -urN psi-0.12.orig/src/psichatdlg.cpp psi-0.12/src/psichatdlg.cpp
---- psi-0.12.orig/src/psichatdlg.cpp 2008-02-02 18:59:35.000000000 +0100
-+++ psi-0.12/src/psichatdlg.cpp 2008-08-09 18:34:42.000000000 +0200
-@@ -420,7 +420,7 @@
- QDateTime t = QDateTime::currentDateTime();
- updateLastMsgTime(t);
- QString timestr = chatView()->formatTimeStamp(t);
-- QString color = "#00A000";
-+ QString color = PsiOptions::instance()->getOption("options.ui.look.colors.chat.system-messages-color").toString();
-
- chatView()->appendText(QString("<font color=\"%1\">[%2]").arg(color, timestr) + QString(" *** %1</font>").arg(str));
- }
-@@ -428,12 +428,12 @@
- QString PsiChatDlg::colorString(bool local, ChatDlg::SpooledType spooled) const
- {
- if (spooled == ChatDlg::Spooled_OfflineStorage)
-- return "#008000";
-+ return PsiOptions::instance()->getOption("options.ui.look.colors.chat.spooled-messages-color").toString();
-
- if (local)
-- return "#FF0000";
-+ return PsiOptions::instance()->getOption("options.ui.look.colors.chat.outgoing-messages-color").toString();
-
-- return "#0000FF";
-+ return PsiOptions::instance()->getOption("options.ui.look.colors.chat.incoming-messages-color").toString();
- }
-
- ChatView* PsiChatDlg::chatView() const
-@@ -459,7 +459,7 @@
- bool doInsert = t.date() != lastMsgTime_.date();
- lastMsgTime_ = t;
- if (doInsert) {
-- QString color = "#00A000";
-+ QString color = PsiOptions::instance()->getOption("options.ui.look.colors.chat.system-messages-color").toString();
- chatView()->appendText(QString("<font color=\"%1\">*** %2</font>").arg(color).arg(t.date().toString(Qt::ISODate)));
- }
- }
-diff -urN psi-0.12.orig/src/psi_profiles.cpp psi-0.12/src/psi_profiles.cpp
---- psi-0.12.orig/src/psi_profiles.cpp 2008-04-24 20:06:44.000000000 +0200
-+++ psi-0.12/src/psi_profiles.cpp 2008-08-09 21:55:03.000000000 +0200
-@@ -1231,6 +1239,14 @@
- migrateColorEntry(tag, "profileback", "options.ui.look.colors.contactlist.profile.header-background");
- migrateColorEntry(tag, "animfront", "options.ui.look.contactlist.status-change-animation.color1");
- migrateColorEntry(tag, "animback", "options.ui.look.contactlist.status-change-animation.color2");
-+ migrateColorEntry(tag, "chatsys", "options.ui.look.colors.chat.system-messages-color");
-+ migrateColorEntry(tag, "chatspool", "options.ui.look.colors.chat.spooled-messages-color");
-+ migrateColorEntry(tag, "chatto", "options.ui.look.colors.chat.outgoing-messages-color");
-+ migrateColorEntry(tag, "chatfrom", "options.ui.look.colors.chat.incoming-messages-color");
-+ migrateColorEntry(tag, "gchatalert", "options.ui.look.colors.groupchat.alert-messages-color");
-+ migrateColorEntry(tag, "gchatsys", "options.ui.look.colors.groupchat.system-messages-color");
-+ migrateColorEntry(tag, "gchatspool", "options.ui.look.colors.groupchat.spooled-messages-color");
-+ migrateColorEntry(tag, "gchatnick", "options.ui.look.colors.groupchat.default-nick-color");
- }
-
- tag = findSubTag(p_lnf, "fonts", &found);
diff --git a/psi-plus-build.patch b/psi-plus-build.patch
deleted file mode 100644
index f2f551c..0000000
--- a/psi-plus-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- psi-plus-0.15.4040/src/systeminfo.cpp~ 2011-06-16 08:45:22.000000000 +0200
-+++ psi-plus-0.15.4040/src/systeminfo.cpp 2011-06-16 08:49:40.974191785 +0200
-@@ -108,7 +108,7 @@
- QString file;
- QString name;
- } osInfo[] = {
-- { LinuxCustom, OsUseFile, ApplicationInfo::homeDir() + "/custom-os", "" },
-+ { LinuxCustom, OsUseFile, ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/custom-os", "" },
-
- { LinuxMandrake, OsUseFile, "/etc/mandrake-release", "Mandrake Linux" },
- { LinuxDebian, OsAppendFile, "/etc/debian_version", "Debian GNU/Linux" },
---- psi-plus-0.15.4127M/src/widgets/actionlineedit.h~ 2011-09-09 20:10:15.000000000 +0200
-+++ psi-plus-0.15.4127M/src/widgets/actionlineedit.h 2011-09-09 21:25:25.369838838 +0200
-@@ -29,6 +29,8 @@
-
- class QMenu;
-
-+static QMenu *menu_;
-+
- class ActionLineEditButton : public QAbstractButton
- {
- Q_OBJECT
---- psi-plus-0.15.4127M/src/widgets/actionlineedit.cpp~ 2011-09-09 20:10:15.000000000 +0200
-+++ psi-plus-0.15.4127M/src/widgets/actionlineedit.cpp 2011-09-09 21:33:15.916458410 +0200
-@@ -226,15 +226,3 @@
- menu->exec(e->globalPos());
- delete menu;
- }
--
--void ActionLineEdit::contextMenuEvent(QContextMenuEvent *e)
--{
-- QMenu *menu;
-- if (isReadOnly()) {
-- menu_->exec(e->globalPos());
-- e->accept();
-- }
-- else {
-- QLineEdit::contextMenuEvent(e);
-- }
--}
diff --git a/psi-plus-customos.patch b/psi-plus-customos.patch
deleted file mode 100644
index 6d78153..0000000
--- a/psi-plus-customos.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- psi-0.11/src/systeminfo.cpp.orig 2007-10-14 16:00:54.000000000 +0200
-+++ psi-0.11/src/systeminfo.cpp 2008-01-25 17:54:13.547934021 +0100
-@@ -15,6 +15,7 @@
- #include <windows.h>
- #endif
-
-+#include "applicationinfo.h"
- #include "systeminfo.h"
-
- SystemInfo::SystemInfo() : QObject(QCoreApplication::instance())
-@@ -52,6 +53,7 @@
- // get description about os
- enum LinuxName {
- LinuxNone = 0,
-+ LinuxCustom,
-
- LinuxMandrake,
- LinuxDebian,
-@@ -83,6 +85,8 @@
- QString file;
- QString name;
- } osInfo[] = {
-+ { LinuxCustom, OsUseFile, ApplicationInfo::homeDir() + "/custom-os", "" },
-+
- { LinuxMandrake, OsUseFile, "/etc/mandrake-release", "Mandrake Linux" },
- { LinuxDebian, OsAppendFile, "/etc/debian_version", "Debian GNU/Linux" },
- { LinuxGentoo, OsUseFile, "/etc/gentoo-release", "Gentoo Linux" },
diff --git a/psi-plus-empty_group-fix.patch b/psi-plus-empty_group-fix.patch
deleted file mode 100644
index b4777e4..0000000
--- a/psi-plus-empty_group-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- psi-0.11/iris/src/xmpp/xmpp-im/types.cpp.orig 2007-10-14 16:00:50.000000000 +0200
-+++ psi-0.11/iris/src/xmpp/xmpp-im/types.cpp 2008-01-25 23:56:27.523786094 +0100
-@@ -2618,7 +2618,7 @@
-
- bool RosterItem::addGroup(const QString &g)
- {
-- if(inGroup(g))
-+ if(inGroup(g) || g.isEmpty())
- return false;
-
- v_groups += g;
-@@ -2667,8 +2667,10 @@
- QDomElement i = n.toElement();
- if(i.isNull())
- continue;
-- if(i.tagName() == "group")
-+ if(i.tagName() == "group") {
- g += tagContent(i);
-+ g.removeAll(QString(""));
-+ }
- }
- QString a = item.attribute("ask");
-
diff --git a/psi-plus-fix_configure_for_ksh.patch b/psi-plus-fix_configure_for_ksh.patch
deleted file mode 100644
index f6b7980..0000000
--- a/psi-plus-fix_configure_for_ksh.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig 2007-10-14 16:00:49.000000000 +0200
-+++ configure 2008-01-25 15:31:19.691535871 +0100
-@@ -701,7 +701,7 @@
- if(QFile::exists(path))
- {
- QString certPathString =
-- "QCA_SYSTEMSTORE_PATH=\\\\\\\\\\\\\"" + path + "\\\\\\\\\\\\\"";
-+ "QCA_SYSTEMSTORE_PATH=" + path + "";
- conf->addDefine(certPathString);
- return true;
- }
-@@ -746,7 +746,7 @@
-
- // Qt<4.2 workaround
- QString certPathString =
-- "QCA_SYSTEMSTORE_PATH=\\\\\\\\\\\\\"" + path + "\\\\\\\\\\\\\"";
-+ "QCA_SYSTEMSTORE_PATH=" + path + "";
- conf->addDefine(certPathString);
-
- return true;
-@@ -1142,8 +1142,8 @@
- QFile file("src/config.h");
- if ( file.open(QIODevice::WriteOnly | QIODevice::Text) ) {
- QTextStream stream( &file );
-- 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\\"" << endl;
-+ stream << "#define PSI_DATADIR \\"" << conf->getenv("DATADIR") << "/psi\\"" << endl;
- }
-
- conf->addDefine("HAVE_CONFIG");
-
diff --git a/psi-plus-icon_buttons_big_return-mod.patch b/psi-plus-icon_buttons_big_return-mod.patch
deleted file mode 100644
index f0c8c8b..0000000
--- a/psi-plus-icon_buttons_big_return-mod.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur psi-0.11.orig/src/widgets/iconwidget.cpp psi-0.11/src/widgets/iconwidget.cpp
---- psi-0.11.orig/src/widgets/iconwidget.cpp 2007-10-14 16:00:55.000000000 +0200
-+++ psi-0.11/src/widgets/iconwidget.cpp 2007-11-26 20:32:28.000000000 +0100
-@@ -642,11 +642,6 @@
-
- void IconButton::setPsiIcon(const PsiIcon *i, bool activate)
- {
--#ifndef Q_WS_X11
-- if ( !text().isEmpty() )
-- return;
--#endif
--
- forceSetPsiIcon(i, activate);
- d->forced = false;
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/psi-plus.git/commitdiff/bb4d1caf7a75e60a66e3e8d906679b5b4cc3f6c9
More information about the pld-cvs-commit
mailing list