SOURCES: psi-appearance-mod.patch - updated for psi 0.12 (at least! window ...
hawk
hawk at pld-linux.org
Sat Aug 9 22:21:02 CEST 2008
Author: hawk Date: Sat Aug 9 20:21:02 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for psi 0.12 (at least! window colors are now taken from system)
---- Files affected:
SOURCES:
psi-appearance-mod.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/psi-appearance-mod.patch
diff -u SOURCES/psi-appearance-mod.patch:1.4 SOURCES/psi-appearance-mod.patch:1.5
--- SOURCES/psi-appearance-mod.patch:1.4 Mon Feb 4 15:57:07 2008
+++ SOURCES/psi-appearance-mod.patch Sat Aug 9 22:20:56 2008
@@ -1,226 +1,80 @@
-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
-
-+ 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);
- }
-
-@@ -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();
-- color = "#FF0000";
-+ color = option.color[cChatTo].name();
- }
- else {
- who = d->dispNick;
-- color = "#0000FF";
-+ color = option.color[cChatFrom].name();
- }
- if(m.spooled())
-- color = "#008000";
-+ color = option.color[cChatSpool].name();
-
- // figure out the encryption state
- bool encChanged = false;
-@@ -1067,7 +1082,10 @@
- }
- }
-
-- QString timestr = ui_.log->formatTimeStamp(m.timeStamp());
-+ QString timestr;
-+ if(option.showTimeStamps) {
-+ timestr = QString("[%1] ").arg(ui_.log->formatTimeStamp(m.timeStamp()));
-+ }
- bool emote = false;
-
- QString me_cmd = "/me ";
-@@ -1103,14 +1121,18 @@
-
- who = Qt::escape(who);
-
-+ if(!emote) {
-+ txt = QString("<span style=\"color: %1\">").arg(option.color[cChatText].name()) + txt +"</span>";
-+ }
-+
- if(emote) {
-- 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)
-- 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
-- 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()) {
- 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, showGroupCounts;
-+ bool raiseChatWindow, showSubjects, showCounter, chatSays, showTimeStamps, showGroupCounts;
-
- QSize sizeEventDlg, sizeChatDlg, sizeTabDlg;
- bool jidComplete, grabUrls, noGCSound;
-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());
+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)));
}
- #endif
-+
-+ if(d->composing) {
-+ 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 {
-+ 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);
-+ }
-+
-+ QPalette le_subj_palette = d->le_subj->palette();
-+ QPalette mle_palette = d->mle->palette();
-+
-+ 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);
}
+@@ -1226,7 +1226,7 @@
- QSize EventDlg::defaultSize()
-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;
-
+ 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=\"" + option.color[cGChatSys].name() + "\">[%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();
-@@ -1250,7 +1250,7 @@
- }
-
- if(!option.gcNickColoring || option.gcNickColors.empty()) {
+@@ -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 option.color[cGChatNick].name();
++ return PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.default-nick-color").toString();
}
- else if(sender == -1 || option.gcNickColors.size() == 1) {
- return option.gcNickColors[option.gcNickColors.size()-1];
-@@ -1278,14 +1278,14 @@
- color = "#0000FF";
- }*/
+ 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();
-+ textcolor = option.color[cGChatText].name();
+ textcolor = ui_.log->palette().active().text().name();
if(alert) {
- textcolor = "#FF0000";
-+ textcolor = option.color[cGChatAlert].name();
++ 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 = option.color[cGChatSpool].name();
++ nickcolor = PsiOptions::instance()->getOption("options.ui.look.colors.groupchat.spooled-messages-color").toString();
QString timestr = ui_.log->formatTimeStamp(m.timeStamp());
-@@ -1443,6 +1443,25 @@
- #ifndef Q_WS_MAC
- setWindowIcon(IconsetFactory::icon("psi/groupChat").icon());
- #endif
-+
-+ 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.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
+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>
@@ -250,7 +104,7 @@
addTab( new OptionsTabIconsetEmoticons(this) );
addTab( new OptionsTabIconsetRoster(this) );
addTab( new OptionsTabIconsetSystem(this) );
-@@ -140,22 +148,19 @@
+@@ -135,21 +143,18 @@
}
//----------------------------------------------------------------------------
@@ -265,7 +119,6 @@
w = 0;
- bg_font = 0;
bg_color = 0;
- o = new Options;
}
OptionsTabAppearanceGeneral::~OptionsTabAppearanceGeneral()
@@ -274,8 +127,8 @@
- delete bg_font;
if ( bg_color )
delete bg_color;
- delete o;
-@@ -183,33 +188,6 @@
+ }
+@@ -175,33 +180,6 @@
w = new OptAppearanceUI();
OptAppearanceUI *d = (OptAppearanceUI *)w;
@@ -309,46 +162,26 @@
bg_color = new QButtonGroup;
bg_color->insert(d->pb_cOnline);
bg_color->insert(d->pb_cOffline);
-@@ -222,6 +200,22 @@
+@@ -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_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);
connect(bg_color, SIGNAL(buttonClicked(QAbstractButton*)), SLOT(chooseColor(QAbstractButton*)));
-@@ -234,8 +228,6 @@
- s.arg(tr("away")));
- QWhatsThis::add(d->pb_cDND,
- s.arg(tr("do not disturb")));
-- QWhatsThis::add(d->pb_cStatus,
-- s.arg(tr("Status message")));
- QWhatsThis::add(d->pb_cProfileBack,
- tr("Specifies the background color for an account name in the main window."));
- QWhatsThis::add(d->pb_cGroupBack,
-@@ -246,6 +238,40 @@
+@@ -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_cChatBG,
-+ tr("Specifies the background color for the chat window."));
-+ QWhatsThis::add(d->pb_cChatText,
-+ tr("Specifies the text color for chat messages."));
+ QWhatsThis::add(d->pb_cChatSys,
+ tr("Specifies the color for system chat messages."));
+ QWhatsThis::add(d->pb_cChatSpool,
@@ -357,10 +190,6 @@
+ 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_cGChatBG,
-+ tr("Specifies the background color for the groupchat window."));
-+ QWhatsThis::add(d->pb_cGChatText,
-+ tr("Specifies the text color for groupchat messages."));
+ QWhatsThis::add(d->pb_cGChatAlert,
+ tr("Specifies the color for alert groupchat messages."));
+ QWhatsThis::add(d->pb_cGChatSys,
@@ -369,40 +198,64 @@
+ tr("Specifies the color for spooled groupchat messages."));
+ QWhatsThis::add(d->pb_cGChatNick,
+ tr("Specifies the default nick color for groupchat messages."));
-+ QWhatsThis::add(d->pb_cMsgBG,
-+ tr("Specifies the background color for the message window."));
-+ QWhatsThis::add(d->pb_cMsgText,
-+ tr("Specifies the text color for messages."));
-+ QWhatsThis::add(d->pb_cStatBG,
-+ tr("Specifies the background color for the status window."));
-+ QWhatsThis::add(d->pb_cStatText,
-+ tr("Specifies the text color for the status window."));
-+ QWhatsThis::add(d->pb_cStatus,
-+ s.arg(tr("Status message")));
// Avatars
//QWhatsThis::add(d->ck_avatarsChatdlg,
-@@ -268,9 +294,6 @@
- //opt->avatarsChatdlgEnabled = d->ck_avatarsChatdlg->isChecked(); // Avatars
+@@ -265,11 +268,6 @@
+ OptAppearanceUI *d = (OptAppearanceUI *)w;
+ //LEGOPTS.avatarsChatdlgEnabled = d->ck_avatarsChatdlg->isChecked(); // Avatars
- int n;
-- for (n = 0; n < 4; ++n)
-- opt->font[n] = le_font[n]->fontName();
+- 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());
-
- for (n = 0; n < cNumColors; ++n)
- opt->color[n] = o->color[n];
+ 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));
}
-@@ -284,9 +307,6 @@
- //d->ck_avatarsChatdlg->setChecked( opt->avatarsChatdlgEnabled ); // Avatars
-
- int n;
-- for (n = 0; n < 4; ++n)
-- le_font[n]->setFont(opt->font[n]);
+
+@@ -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());
-
- for (n = 0; n < cNumColors; ++n) {
- o->color[n] = opt->color[n];
- ((QPushButton*) (bg_color->buttons()[n]))->setPixmap(name2color(opt->color[n].name()));
-@@ -298,20 +318,6 @@
+ 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>());
+ }
+
+@@ -322,20 +331,6 @@
parentWidget = parentDialog;
}
@@ -423,7 +276,7 @@
void OptionsTabAppearanceGeneral::chooseColor(QAbstractButton* button)
{
QColor c;
-@@ -327,3 +333,103 @@
+@@ -352,3 +347,106 @@
emit dataChanged();
}
}
@@ -433,18 +286,16 @@
+//----------------------------------------------------------------------------
+
+OptionsTabAppearanceFonts::OptionsTabAppearanceFonts(QObject *parent)
-+: OptionsTab(parent, "appearance_fonts", "", tr("Fonts"), tr("Font Settings"))
++: OptionsTab(parent, "appearance_general", "", tr("Fonts"), tr("Fonts"))
+{
+ w = 0;
+ bg_font = 0;
-+ o = new Options;
+}
+
+OptionsTabAppearanceFonts::~OptionsTabAppearanceFonts()
+{
+ if ( bg_font )
+ delete bg_font;
-+ delete o;
+}
+
+QWidget *OptionsTabAppearanceFonts::widget()
@@ -481,32 +332,37 @@
+ 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(Options *opt)
++
++void OptionsTabAppearanceFonts::applyOptions()
+{
+ if ( !w )
+ return;
+
-+ //OptAppearanceFontsUI *d = (OptAppearanceFontsUI *)w;
++ OptAppearanceFontsUI *d = (OptAppearanceFontsUI *)w;
++ //LEGOPTS.avatarsChatdlgEnabled = d->ck_avatarsChatdlg->isChecked(); // Avatars
+
-+ int n;
-+ for (n = 0; n < 4; ++n)
-+ opt->font[n] = le_font[n]->fontName();
++ 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(const Options *opt)
++void OptionsTabAppearanceFonts::restoreOptions()
+{
+ if ( !w )
+ return;
+
-+ //OptAppearanceFontsUI *d = (OptAppearanceFontsUI *)w;
-+
-+ int n;
-+ for (n = 0; n < 4; ++n)
-+ le_font[n]->setFont(opt->font[n]);
++ 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)
@@ -527,9 +383,9 @@
+ if(ok)
+ emit dataChanged();
+}
-diff -urN psi-0.11.orig/src/options/opt_appearance_fonts.ui psi-0.11/src/options/opt_appearance_fonts.ui
---- psi-0.11.orig/src/options/opt_appearance_fonts.ui 1970-01-01 01:00:00.000000000 +0100
-+++ psi-0.11/src/options/opt_appearance_fonts.ui 2008-01-27 13:33:31.000000000 +0100
+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>
@@ -541,7 +397,7 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
-+ <width>455</width>
++ <width>402</width>
+ <height>184</height>
+ </rect>
+ </property>
@@ -567,8 +423,19 @@
+ <property name="spacing" >
+ <number>6</number>
+ </property>
-+ <item row="2" column="1" colspan="3" >
-+ <widget class="FontLabel" name="le_fChat" />
++ <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" >
@@ -580,10 +447,29 @@
+ </property>
+ </widget>
+ </item>
-+ <item row="1" column="0" >
<<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.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list