Author: hawk Date: Sun Jan 27 17:18:20 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for psi 0.11
---- Files affected:
SOURCES:
psi-appearance-mod.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/psi-appearance-mod.patch
diff -u SOURCES/psi-appearance-mod.patch:1.2
SOURCES/psi-appearance-mod.patch:1.3
--- SOURCES/psi-appearance-mod.patch:1.2 Sun Jan 22 15:03:50 2006
+++ SOURCES/psi-appearance-mod.patch Sun Jan 27 18:18:15 2008
@@ -1,31 +1,38 @@
-diff -urN psi-0.10.orig/src/chatdlg.cpp psi-0.10/src/chatdlg.cpp
---- psi-0.10.orig/src/chatdlg.cpp 2006-01-21 19:04:56.000000000 +0100
-+++ psi-0.10/src/chatdlg.cpp 2006-01-21 19:12:26.885294000 +0100
-@@ -692,6 +692,14 @@
- setIcon(IconsetFactory::icon("psi/start-chat"));
+diff -urN psi-0.11.orig/src/chatdlg.cpp psi-0.11/src/chatdlg.cpp
+--- psi-0.11.orig/src/chatdlg.cpp 2008-01-26 22:03:04.000000000 +0100
++++ psi-0.11/src/chatdlg.cpp 2008-01-27 16:17:37.000000000 +0100
+@@ -776,6 +776,21 @@
+ setWindowIcon(IconsetFactory::icon("psi/start-chat").icon());
#endif
-+ d->log->setPaletteBackgroundColor(option.color[cChatBG]);
-+ d->mle->setPaletteBackgroundColor(option.color[cChatBG]);
-+ d->le_jid->setPaletteBackgroundColor(option.color[cChatBG]);
-+
-+ d->log->setPaletteForegroundColor(option.color[cChatMessage]);
-+ d->mle->setPaletteForegroundColor(option.color[cChatMessage]);
-+ d->le_jid->setPaletteForegroundColor(option.color[cChatMessage]);
-+
- /*QBrush brush;
- brush.setPixmap( QPixmap( option.chatBgImage ) );
- d->log->setPaper(brush);
-@@ -933,7 +941,7 @@
- y = 0;
- bool atBottom = (d->log->contentsY() < y - 32) ? false: true;
-
-- d->log->append(QString("<font color=\"#00A000\">[%1]").arg(timestr) +
QString(" *** %1</font>").arg(str));
-+ d->log->append(QString("<font color=\"" + option.color[cChatSys].name()
+ "\">[%1]").arg(timestr) + QString(" *** %1</font>").arg(str));
- if(atBottom)
- deferredScroll();
++ QPalette log_palette = ui_.log->palette();
++ QPalette mle_palette = ui_.mle->palette();
++ QPalette le_jid_palette = ui_.le_jid->palette();
++
++ log_palette.setColor(QColorGroup::Base, option.color[cChatBG]);
++ log_palette.setColor(QColorGroup::Text, option.color[cChatText]);
++ mle_palette.setColor(QColorGroup::Base, option.color[cChatBG]);
++ mle_palette.setColor(QColorGroup::Text, option.color[cChatText]);
++ le_jid_palette.setColor(QColorGroup::Base, option.color[cChatBG]);
++ le_jid_palette.setColor(QColorGroup::Text, option.color[cChatText]);
++
++ ui_.log->setPalette(log_palette);
++ ui_.mle->setPalette(mle_palette);
++ ui_.le_jid->setPalette(le_jid_palette);
++
+
setWindowOpacity(double(qMax(MINIMUM_OPACITY,PsiOptions::instance()->getOption("options.ui.chat.opacity").toInt()))/100);
}
-@@ -944,14 +952,14 @@
+
+@@ -1023,7 +1038,7 @@
+ void ChatDlg::appendSysMsg(const QString &str)
+ {
+ QString timestr =
ui_.log->formatTimeStamp(QDateTime::currentDateTime());
+- ui_.log->appendText(QString("<font
color=\"#00A000\">[%1]").arg(timestr) + QString(" *** %1</font>").arg(str));
++ ui_.log->appendText(QString("<font color=\"" +
option.color[cChatSys].name() + "\">[%1]").arg(timestr) + QString(" ***
%1</font>").arg(str));
+ }
+
+ void ChatDlg::appendMessage(const Message &m, bool local)
+@@ -1032,14 +1047,14 @@
if(local) {
who = d->pa->nick();
@@ -43,111 +50,122 @@
// figure out the encryption state
bool encChanged = false;
-@@ -980,8 +988,12 @@
+@@ -1067,7 +1082,10 @@
+ }
}
- QString timestr;
-- QDateTime time = m.timeStamp();
-- timestr = time.time().toString(LocalDate);
-+ if(option.showTimeStamps)
-+ {
-+ QDateTime time = m.timeStamp();
-+ //timestr.sprintf("[%02d:%02d:%02d] ", time.time().hour(),
time.time().minute(), time.time().second());
-+ timestr = QString("[") + time.time().toString(LocalDate) + "] ";
+- QString timestr = ui_.log->formatTimeStamp(m.timeStamp());
++ QString timestr;
++ if(option.showTimeStamps) {
++ timestr = QString("[%1]
").arg(ui_.log->formatTimeStamp(m.timeStamp()));
+ }
+ bool emote = false;
- int y = d->log->contentsHeight() - d->log->visibleHeight();
- if(y < 0)
-@@ -1003,16 +1015,19 @@
- if(option.useEmoticons)
- txt = emoticonify(txt);
+ QString me_cmd = "/me ";
+@@ -1103,14 +1121,18 @@
-+ if(!emote)
-+ txt = QString("<font
color=\"%1\">").arg(option.color[cChatMessage].name()) + txt +"</font>";
-+
- who = expandEntities(who);
+ who = Qt::escape(who);
++ if(!emote) {
++ txt = QString("<span style=\"color:
%1\">").arg(option.color[cChatText].name()) + txt +"</span>";
++ }
++
if(emote) {
-- d->log->append(QString("<font color=\"%1\">").arg(color) +
QString("[%1]").arg(timestr) + QString(" *%1 ").arg(who) + txt + "</font>");
-+ d->log->append(QString("<font color=\"%1\"><i>").arg(color) +
timestr + QString("**%1 ").arg(who) + txt + QString("</i></font>"));
+- ui_.log->appendText(QString("<span style=\"color:
%1\">").arg(color) + QString("[%1]").arg(timestr) + QString(" *%1 ").arg(who) +
txt + "</span>");
++ ui_.log->appendText(QString("<span style=\"color:
%1\"><i>").arg(color) + timestr + QString(" **%1 ").arg(who) + txt +
"</i></span>");
}
else {
if(option.chatSays)
-- d->log->append(QString("<font
color=\"%1\">").arg(color) + QString("[%1] ").arg(timestr) + tr("%1
says:").arg(who) + "</font><br>" + txt);
-+ d->log->append(QString("<font
color=\"%1\">").arg(color) + timestr + tr("%1 says:").arg(who) + "</font><br>"
+ txt);
+- ui_.log->appendText(QString("<p style=\"color:
%1\">").arg(color) + QString("[%1] ").arg(timestr) + tr("%1 says:").arg(who) +
"</p>" + txt);
++ ui_.log->appendText(QString("<p style=\"color:
%1\">").arg(color) + timestr + tr("%1 says:").arg(who) + "</p>" + txt);
else
-- d->log->append(QString("<font
color=\"%1\">").arg(color) + QString("[%1] <").arg(timestr) + who +
QString("></font> ") + txt);
-+ d->log->append(QString("<font
color=\"%1\">").arg(color) + timestr + who + QString(":</font> ") + txt);
+- ui_.log->appendText(QString("<span style=\"color:
%1\">").arg(color) + QString("[%1] <").arg(timestr) + who +
QString("></span> ") + txt);
++ ui_.log->appendText(QString("<span style=\"color:
%1\">").arg(color) + timestr + who + QString(":</span> ") + txt);
}
if(!m.subject().isEmpty()) {
- d->log->append(QString("<b>") + tr("Subject:") + "</b> " +
QString("%1").arg(expandEntities(m.subject())));
-diff -urN psi-0.10.orig/src/common.h psi-0.10/src/common.h
---- psi-0.10.orig/src/common.h 2006-01-21 19:04:56.000000000 +0100
-+++ psi-0.10/src/common.h 2006-01-22 00:52:36.225294000 +0100
-@@ -69,14 +69,14 @@
- extern uint psi_dialog_flags;
-
- // options stuff
--enum { cOnline, cOffline, cAway, cDND, cProfileFore, cProfileBack,
cGroupFore, cGroupBack, cListBack, cAnimFront, cAnimBack };
-+enum { cOnline, cOffline, cAway, cDND, cProfileFore, cProfileBack,
cGroupFore, cGroupBack, cListBack, cAnimFront, cAnimBack, cMsgBG, cMsgText,
cChatBG, cChatMessage, cChatSys, cChatSpool, cChatTo, cChatFrom, cGChatBG,
cGChatMessage, cGChatAlert, cGChatSys, cGChatSpool, cGChatNick, colorLast };
- enum { fRoster, fMessage, fChat, fPopup };
- enum { eMessage, eChat1, eChat2, eHeadline, eSystem, eOnline, eOffline,
eSend, eIncomingFT, eFTComplete };
- enum { dcClose, dcHour, dcDay, dcNever };
-
- struct Options
- {
-- QColor color[11];
-+ QColor color[colorLast];
- QString font[4];
- int smallFontSize; // do not modify or save/load this value! it is
calculated at run time!
- int alertStyle;
-@@ -123,7 +123,7 @@
- QString customBrowser, customMailer;
+ ui_.log->appendText(QString("<b>") + tr("Subject:") + "</b> " +
QString("%1").arg(TextUtil::plain2rich(m.subject())));
+diff -urN psi-0.11.orig/src/common.h psi-0.11/src/common.h
+--- psi-0.11.orig/src/common.h 2008-01-26 22:03:04.000000000 +0100
++++ psi-0.11/src/common.h 2008-01-27 16:46:50.000000000 +0100
+@@ -46,6 +46,22 @@
+ cListBack,
+ cAnimFront,
+ cAnimBack,
++ cChatBG,
++ cChatText,
++ cChatSys,
++ cChatSpool,
++ cChatTo,
++ cChatFrom,
++ cGChatBG,
++ cGChatText,
++ cGChatAlert,
++ cGChatSys,
++ cGChatSpool,
++ cGChatNick,
++ cMsgBG,
++ cMsgText,
++ cStatBG,
++ cStatText,
+ cStatus,
+ cNumColors // A guard to store the number of colors
+ };
+@@ -97,7 +113,7 @@
+ QString player;
bool ignoreHeadline, ignoreNonRoster, excludeGroupChatsFromIgnore,
scrollTo, keepSizes, useEmoticons, alertOpenChats;
-- bool raiseChatWindow, showSubjects, showCounter, chatSays,
chatSoftReturn, showGroupCounts;
-+ bool raiseChatWindow, showSubjects, showCounter, chatSays,
showTimeStamps, showGroupCounts, chatSoftReturn;
+- bool raiseChatWindow, showSubjects, showCounter, chatSays,
showGroupCounts;
++ bool raiseChatWindow, showSubjects, showCounter, chatSays,
showTimeStamps, showGroupCounts;
QSize sizeEventDlg, sizeChatDlg, sizeTabDlg;
bool jidComplete, grabUrls, noGCSound;
-diff -urN psi-0.10.orig/src/eventdlg.cpp psi-0.10/src/eventdlg.cpp
---- psi-0.10.orig/src/eventdlg.cpp 2005-08-21 19:44:33.000000000 +0200
-+++ psi-0.10/src/eventdlg.cpp 2006-01-22 00:51:20.335294000 +0100
-@@ -1210,6 +1210,21 @@
- setIcon(d->anim->impix());
+diff -urN psi-0.11.orig/src/eventdlg.cpp psi-0.11/src/eventdlg.cpp
+--- psi-0.11.orig/src/eventdlg.cpp 2007-10-14 16:00:51.000000000 +0200
++++ psi-0.11/src/eventdlg.cpp 2008-01-27 17:00:36.000000000 +0100
+@@ -1386,6 +1386,30 @@
+ setWindowIcon(d->anim->icon());
}
#endif
+
+ if(d->composing) {
-+ d->le_to->setPaletteBackgroundColor(option.color[cMsgBG]);
-+ d->le_to->setPaletteForegroundColor(option.color[cMsgText]);
++ QPalette le_to_palette = d->le_to->palette();
++ le_to_palette.setColor(QColorGroup::Base, option.color[cMsgBG]);
++ le_to_palette.setColor(QColorGroup::Text,
option.color[cMsgText]);
++ d->le_to->setPalette(le_to_palette);
+ }
+ else {
-+ d->le_from->setPaletteBackgroundColor(option.color[cMsgBG]);
-+ d->le_from->setPaletteForegroundColor(option.color[cMsgText]);
++ QPalette le_from_palette = d->le_from->palette();
++ le_from_palette.setColor(QColorGroup::Base,
option.color[cMsgBG]);
++ le_from_palette.setColor(QColorGroup::Text,
option.color[cMsgText]);
++ d->le_from->setPalette(le_from_palette);
+ }
+
-+ d->le_subj->setPaletteBackgroundColor(option.color[cMsgBG]);
-+ d->mle->setPaletteBackgroundColor(option.color[cMsgBG]);
++ QPalette le_subj_palette = d->le_subj->palette();
++ QPalette mle_palette = d->mle->palette();
+
-+ d->le_subj->setPaletteForegroundColor(option.color[cMsgText]);
-+ d->mle->setPaletteForegroundColor(option.color[cMsgText]);
++ le_subj_palette.setColor(QColorGroup::Base, option.color[cMsgBG]);
++ le_subj_palette.setColor(QColorGroup::Text, option.color[cMsgText]);
++ mle_palette.setColor(QColorGroup::Base, option.color[cMsgBG]);
++ mle_palette.setColor(QColorGroup::Text, option.color[cMsgText]);
++
++ d->le_subj->setPalette(le_subj_palette);
++ d->mle->setPalette(mle_palette);
}
QSize EventDlg::defaultSize()
-diff -urN psi-0.10.orig/src/groupchatdlg.cpp psi-0.10/src/groupchatdlg.cpp
---- psi-0.10.orig/src/groupchatdlg.cpp 2006-01-07 22:19:01.000000000 +0100
-+++ psi-0.10/src/groupchatdlg.cpp 2006-01-22 00:05:06.775294000 +0100
-@@ -1149,7 +1149,7 @@
- y = 0;
- bool atBottom = (d->te_log->contentsY() < y - 32) ? false: true;*/
-
-- d->te_log->append(hr + QString("<font
color=\"#00A000\">[%1]").arg(timestr) + QString(" ***
%1</font>").arg(expandEntities(str)));
-+ d->te_log->append(hr + QString("<font color=\"" +
option.color[cGChatSys].name() + "\">[%1]").arg(timestr) + QString(" ***
%1</font>").arg(expandEntities(str)));
-
- if(atBottom)
- d->deferredScroll();
-@@ -1173,7 +1173,7 @@
+diff -urN psi-0.11.orig/src/groupchatdlg.cpp psi-0.11/src/groupchatdlg.cpp
+--- psi-0.11.orig/src/groupchatdlg.cpp 2007-10-14 16:00:51.000000000 +0200
++++ psi-0.11/src/groupchatdlg.cpp 2008-01-27 16:25:16.000000000 +0100
+@@ -1229,7 +1229,7 @@
+ time = ts;
+
+ 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=\"" +
option.color[cGChatSys].name() + "\">[%1]").arg(timestr) + QString(" ***
%1</font>").arg(Qt::escape(str)));
+
+ if(alert)
+ doAlert();
+@@ -1250,7 +1250,7 @@
}
if(!option.gcNickColoring || option.gcNickColors.empty()) {
@@ -156,12 +174,12 @@
}
else if(sender == -1 || option.gcNickColors.size() == 1) {
return option.gcNickColors[option.gcNickColors.size()-1];
-@@ -1214,14 +1214,14 @@
+@@ -1278,14 +1278,14 @@
color = "#0000FF";
}*/
nickcolor = getNickColor(who);
-- textcolor = d->te_log->palette().active().text().name();
-+ textcolor = option.color[cGChatMessage].name();
+- textcolor = ui_.log->palette().active().text().name();
++ textcolor = option.color[cGChatText].name();
if(alert) {
- textcolor = "#FF0000";
+ textcolor = option.color[cGChatAlert].name();
@@ -172,37 +190,59 @@
- nickcolor = "#008000"; //color = "#008000";
+ nickcolor = option.color[cGChatSpool].name();
- QString timestr;
- QDateTime time = m.timeStamp();
-@@ -1375,6 +1375,16 @@
+ QString timestr = ui_.log->formatTimeStamp(m.timeStamp());
+
+@@ -1443,6 +1443,25 @@
#ifndef Q_WS_MAC
- setIcon(IconsetFactory::icon("psi/groupChat"));
+ setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
#endif
+
-+ d->te_log->setPaletteBackgroundColor(option.color[cGChatBG]);
-+ d->mle->setPaletteBackgroundColor(option.color[cGChatBG]);
-+ d->le_topic->setPaletteBackgroundColor(option.color[cGChatBG]);
-+ d->lv_users->setPaletteBackgroundColor(option.color[cGChatBG]);
-+
-+ d->te_log->setPaletteForegroundColor(option.color[cGChatMessage]);
-+ d->mle->setPaletteForegroundColor(option.color[cGChatMessage]);
-+ d->le_topic->setPaletteForegroundColor(option.color[cGChatMessage]);
-+ d->lv_users->setPaletteForegroundColor(option.color[cGChatMessage]);
++ QPalette le_topic_palette = ui_.le_topic->palette();
++ QPalette lv_users_palette = ui_.lv_users->palette();
++ QPalette log_palette = ui_.log->palette();
++ QPalette mle_palette = ui_.mle->palette();
++
++ le_topic_palette.setColor(QColorGroup::Base, option.color[cGChatBG]);
++ le_topic_palette.setColor(QColorGroup::Text, option.color[cGChatText]);
++ lv_users_palette.setColor(QColorGroup::Base, option.color[cGChatBG]);
++ lv_users_palette.setColor(QColorGroup::Text, option.color[cGChatText]);
++ log_palette.setColor(QColorGroup::Base, option.color[cGChatBG]);
++ log_palette.setColor(QColorGroup::Text, option.color[cGChatText]);
++ mle_palette.setColor(QColorGroup::Base, option.color[cGChatBG]);
++ mle_palette.setColor(QColorGroup::Text, option.color[cGChatText]);
++
++ ui_.log->setPalette(log_palette);
++ ui_.mle->setPalette(log_palette);
++ ui_.le_topic->setPalette(log_palette);
++ ui_.lv_users->setPalette(log_palette);
}
void GCMainDlg::optionsUpdate()
-diff -urN psi-0.10.orig/src/options/opt_appearance.cpp
psi-0.10/src/options/opt_appearance.cpp
---- psi-0.10.orig/src/options/opt_appearance.cpp 2006-01-21
19:04:56.000000000 +0100
-+++ psi-0.10/src/options/opt_appearance.cpp 2006-01-22 14:56:26.320148000
+0100
+diff -urN psi-0.11.orig/src/options/opt_appearance.cpp
psi-0.11/src/options/opt_appearance.cpp
+--- psi-0.11.orig/src/options/opt_appearance.cpp 2008-01-26
22:03:04.000000000 +0100
++++ psi-0.11/src/options/opt_appearance.cpp 2008-01-27 16:49:30.000000000
+0100
@@ -17,6 +17,7 @@
#include <qlineedit.h>
- #include "opt_appearance-ui.h"
-+#include "opt_appearance_fonts-ui.h"
- #include "opt_appearance_misc-ui.h"
+ #include "ui_opt_appearance.h"
++#include "ui_opt_appearance_fonts.h"
+ #include "ui_opt_appearance_misc.h"
+ #include "psioptions.h"
- //----------------------------------------------------------------------------
-@@ -58,6 +59,7 @@
+@@ -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) );
@@ -210,183 +250,104 @@
addTab( new OptionsTabIconsetEmoticons(this) );
addTab( new OptionsTabIconsetRoster(this) );
addTab( new OptionsTabIconsetSystem(this) );
-@@ -130,48 +132,31 @@
+@@ -140,22 +148,19 @@
}
//----------------------------------------------------------------------------
-// OptionsTabAppearanceGeneral: Fonts & Colours
-+// OptionsTabAppearanceFonts
++// OptionsTabAppearanceGeneral: Colours
//----------------------------------------------------------------------------
--OptionsTabAppearanceGeneral::OptionsTabAppearanceGeneral(QObject *parent)
+ OptionsTabAppearanceGeneral::OptionsTabAppearanceGeneral(QObject *parent)
-: OptionsTab(parent, "appearance_general", "", tr("Fonts && Colors"),
tr("Fonts && Color Settings"))
-+OptionsTabAppearanceFonts::OptionsTabAppearanceFonts(QObject *parent)
-+: OptionsTab(parent, "appearance_fonts", "", tr("Fonts"), tr("Font Settings"))
++: OptionsTab(parent, "appearance_general", "", tr("Colors"), tr("Color
Settings"))
{
w = 0;
- bg_font = 0;
-- bg_color = 0;
+- bg_font = 0;
+ bg_color = 0;
o = new Options;
}
--OptionsTabAppearanceGeneral::~OptionsTabAppearanceGeneral()
-+OptionsTabAppearanceFonts::~OptionsTabAppearanceFonts()
+ OptionsTabAppearanceGeneral::~OptionsTabAppearanceGeneral()
{
- if ( bg_font )
- delete bg_font;
-- if ( bg_color )
-- delete bg_color;
+- if ( bg_font )
+- delete bg_font;
+ if ( bg_color )
+ delete bg_color;
delete o;
- }
-
--static QPixmap name2color(QString name) // taken from opt_general.cpp
--{
-- QColor c(name);
-- QPixmap pix(16, 16);
-- QPainter p(&pix);
+@@ -183,33 +188,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;
-
-- p.fillRect(0, 0, pix.width(), pix.height(), QBrush(c));
-- p.setPen( QColor(0, 0, 0) );
-- p.drawRect(0, 0, pix.width(), pix.height());
-- p.end();
+- 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*)));
-
-- return pix;
--}
+- 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."));
-
--QWidget *OptionsTabAppearanceGeneral::widget()
-+QWidget *OptionsTabAppearanceFonts::widget()
- {
- if ( w )
- return 0;
-
-- w = new OptAppearanceUI();
-- OptAppearanceUI *d = (OptAppearanceUI *)w;
-+ w = new OptAppearanceFontsUI();
-+ OptAppearanceFontsUI *d = (OptAppearanceFontsUI *)w;
-
- le_font[0] = d->le_fRoster;
- le_font[1] = d->le_fMessage;
-@@ -200,6 +185,88 @@
- QWhatsThis::add(d->pb_fChat,
- tr("Selects a font for chat windows using the font selection
dialog."));
-
-+ return w;
-+}
-+
-+void OptionsTabAppearanceFonts::applyOptions(Options *opt)
-+{
-+ if ( !w )
-+ return;
-+
-+ int n;
-+ for (n = 0; n < 4; ++n)
-+ opt->font[n] = le_font[n]->fontName();
-+}
-+
-+void OptionsTabAppearanceFonts::restoreOptions(const Options *opt)
-+{
-+ if ( !w )
-+ return;
-+
-+ int n;
-+ for (n = 0; n < 4; ++n)
-+ le_font[n]->setFont(opt->font[n]);
-+}
-+
-+void OptionsTabAppearanceFonts::setData(PsiCon *, QWidget *parentDialog)
-+{
-+ parentWidget = parentDialog;
-+}
-+
-+void OptionsTabAppearanceFonts::chooseFont(int x)
-+{
-+ bool ok;
-+ QFont font;
-+ font.fromString( le_font[x]->fontName() );
-+
-+ QString fnt = QFontDialog::getFont(&ok, font, parentWidget).toString();
-+ le_font[x]->setFont(fnt);
-+
-+ if(ok)
-+ emit dataChanged();
-+}
-+
-+//----------------------------------------------------------------------------
-+// OptionsTabAppearanceGeneral: Colours
-+//----------------------------------------------------------------------------
-+
-+OptionsTabAppearanceGeneral::OptionsTabAppearanceGeneral(QObject *parent)
-+: OptionsTab(parent, "appearance_general", "", tr("Colors"), tr("Color
Settings"))
-+{
-+ w = 0;
-+ bg_color = 0;
-+ o = new Options;
-+}
-+
-+OptionsTabAppearanceGeneral::~OptionsTabAppearanceGeneral()
-+{
-+ if ( bg_color )
-+ delete bg_color;
-+ delete o;
-+}
-+
-+static QPixmap name2color(QString name) // taken from opt_general.cpp
-+{
-+ QColor c(name);
-+ QPixmap pix(16, 16);
-+ QPainter p(&pix);
-+
-+ p.fillRect(0, 0, pix.width(), pix.height(), QBrush(c));
-+ p.setPen( QColor(0, 0, 0) );
-+ p.drawRect(0, 0, pix.width(), pix.height());
-+ p.end();
-+
-+ return pix;
-+}
-+
-+QWidget *OptionsTabAppearanceGeneral::widget()
-+{
-+ if ( w )
-+ return 0;
-+
-+ w = new OptAppearanceUI();
-+ OptAppearanceUI *d = (OptAppearanceUI *)w;
-+
bg_color = new QButtonGroup;
- bg_color->insert(d->pb_cOnline, 0);
- bg_color->insert(d->pb_cOffline, 1);
-@@ -212,6 +279,20 @@
- bg_color->insert(d->pb_cListBack, 8);
- bg_color->insert(d->pb_cAnimFront, 9);
- bg_color->insert(d->pb_cAnimBack, 10);
-+ bg_color->insert(d->pb_cMsgBG, 11);
-+ bg_color->insert(d->pb_cMsgText, 12);
-+ bg_color->insert(d->pb_cChatBG, 13);
-+ bg_color->insert(d->pb_cChatMessage, 14);
-+ bg_color->insert(d->pb_cChatSys, 15);
-+ bg_color->insert(d->pb_cChatSpool, 16);
-+ bg_color->insert(d->pb_cChatTo, 17);
-+ bg_color->insert(d->pb_cChatFrom, 18);
-+ bg_color->insert(d->pb_cGChatBG, 19);
-+ bg_color->insert(d->pb_cGChatMessage, 20);
-+ bg_color->insert(d->pb_cGChatAlert, 21);
-+ bg_color->insert(d->pb_cGChatSys, 22);
-+ bg_color->insert(d->pb_cGChatSpool, 23);
-+ bg_color->insert(d->pb_cGChatNick, 24);
- connect(bg_color, SIGNAL(clicked(int)), SLOT(chooseColor(int)));
-
- QString s = tr("Specifies the text color for a contact name in the main
window when that user is \"%1\".");
-@@ -233,6 +314,34 @@
+ bg_color->insert(d->pb_cOnline);
+ bg_color->insert(d->pb_cOffline);
+@@ -222,6 +200,22 @@
+ bg_color->insert(d->pb_cListBack);
+ bg_color->insert(d->pb_cAnimFront);
+ bg_color->insert(d->pb_cAnimBack);
++ bg_color->insert(d->pb_cChatBG);
++ bg_color->insert(d->pb_cChatText);
++ 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_cGChatBG);
++ bg_color->insert(d->pb_cGChatText);
++ 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_cMsgBG);
++ bg_color->insert(d->pb_cMsgText);
++ bg_color->insert(d->pb_cStatBG);
++ bg_color->insert(d->pb_cStatText);
+ bg_color->insert(d->pb_cStatus);
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/psi-appearance-mod.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
