SOURCES: psi-appearance-mod.patch (NEW) - enhanced version of psi-...

hawk hawk at pld-linux.org
Sun Jan 22 01:21:35 CET 2006


Author: hawk                         Date: Sun Jan 22 00:21:35 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- enhanced version of psi-nicechat-mod.patch, allows user to set more
  custom colors

---- Files affected:
SOURCES:
   psi-appearance-mod.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/psi-appearance-mod.patch
diff -u /dev/null SOURCES/psi-appearance-mod.patch:1.1
--- /dev/null	Sun Jan 22 01:21:35 2006
+++ SOURCES/psi-appearance-mod.patch	Sun Jan 22 01:21:30 2006
@@ -0,0 +1,1119 @@
+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"));
+ #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();
+ }
+@@ -944,14 +952,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;
+@@ -980,8 +988,12 @@
+ 	}
+ 
+ 	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) + "] ";
++	}
+ 
+ 	int y = d->log->contentsHeight() - d->log->visibleHeight();
+ 	if(y < 0)
+@@ -1003,16 +1015,19 @@
+ 	if(option.useEmoticons)
+ 		txt = emoticonify(txt);
+ 
++	if(!emote)
++		txt = QString("<font color=\"%1\">").arg(option.color[cChatMessage].name()) + txt +"</font>";
++
+ 	who = expandEntities(who);
+ 
+ 	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>"));
+ 	}
+ 	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);
+ 		else
+-			d->log->append(QString("<font color=\"%1\">").arg(color) + QString("[%1] &lt;").arg(timestr) + who + QString("&gt;</font> ") + txt);
++			d->log->append(QString("<font color=\"%1\">").arg(color) + timestr + who + QString(":</font> ") + 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;
+ 
+ 	bool ignoreHeadline, ignoreNonRoster, excludeGroupChatsFromIgnore, scrollTo, keepSizes, useEmoticons, alertOpenChats;
+-	bool raiseChatWindow, showSubjects, showCounter, chatSays, chatSoftReturn, showGroupCounts;
++	bool raiseChatWindow, showSubjects, showCounter, chatSays, showTimeStamps, showGroupCounts, chatSoftReturn;
+ 
+ 	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());
+ 	}
+ #endif
++
++	if(d->composing) {
++		d->le_to->setPaletteBackgroundColor(option.color[cMsgBG]);
++		d->le_to->setPaletteForegroundColor(option.color[cMsgText]);
++	}
++	else {
++		d->le_from->setPaletteBackgroundColor(option.color[cMsgBG]);
++		d->le_from->setPaletteForegroundColor(option.color[cMsgText]);
++	}
++
++	d->le_subj->setPaletteBackgroundColor(option.color[cMsgBG]);
++	d->mle->setPaletteBackgroundColor(option.color[cMsgBG]);
++
++	d->le_subj->setPaletteForegroundColor(option.color[cMsgText]);
++	d->mle->setPaletteForegroundColor(option.color[cMsgText]);
+ }
+ 
+ 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 @@
+ 	}
+ 
+ 	if(!option.gcNickColoring || option.gcNickColors.empty()) {
+-		return "#000000";
++		return option.color[cGChatNick].name();
+ 	}
+ 	else if(sender == -1 || option.gcNickColors.size() == 1) {
+ 		return option.gcNickColors[option.gcNickColors.size()-1];
+@@ -1214,14 +1214,14 @@
+ 		color = "#0000FF";
+ 	}*/
+ 	nickcolor = getNickColor(who);
+-	textcolor = d->te_log->palette().active().text().name();
++	textcolor = option.color[cGChatMessage].name();
+ 	if(alert) {
+-		textcolor = "#FF0000";
++		textcolor = option.color[cGChatAlert].name();
+ 		alerttagso = "<b>";
+ 		alerttagsc = "</b>";
+ 	}
+ 	if(m.spooled())
+-		nickcolor = "#008000"; //color = "#008000";
++		nickcolor = option.color[cGChatSpool].name();
+ 
+ 	QString timestr;
+ 	QDateTime time = m.timeStamp();
+@@ -1375,6 +1375,16 @@
+ #ifndef Q_WS_MAC
+ 	setIcon(IconsetFactory::icon("psi/groupChat"));
+ #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]);
+ }
+ 
+ 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-21 19:31:55.475294000 +0100
+@@ -212,6 +212,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 +247,34 @@
+ 		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_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_cChatBG,
++		tr("Specifies the background color for the chat window."));
++	QWhatsThis::add(d->pb_cChatMessage,
++		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,
++		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_cGChatBG,
++		tr("Specifies the background color for the groupchat window."));
++	QWhatsThis::add(d->pb_cGChatMessage,
++		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,
++		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,
+@@ -253,7 +295,7 @@
+ 	for (n = 0; n < 4; ++n)
+ 		opt->font[n] = le_font[n]->fontName();
+ 
+-	for (n = 0; n < 11; ++n)
++	for (n = 0; n < 25; ++n)
+ 		opt->color[n] = o->color[n];
+ }
+ 
+@@ -269,7 +311,7 @@
+ 	for (n = 0; n < 4; ++n)
+ 		le_font[n]->setFont(opt->font[n]);
+ 
+-	for (n = 0; n < 11; ++n) {
++	for (n = 0; n < 25; ++n) {
+ 		o->color[n] = opt->color[n];
+ 		((QPushButton *)bg_color->find(n))->setPixmap(name2color(opt->color[n].name()));
+ 	}
+diff -urN psi-0.10.orig/src/options/opt_appearance-ui.ui psi-0.10/src/options/opt_appearance-ui.ui
+--- psi-0.10.orig/src/options/opt_appearance-ui.ui	2005-10-14 02:36:14.000000000 +0200
++++ psi-0.10/src/options/opt_appearance-ui.ui	2006-01-21 19:41:24.765294000 +0100
+@@ -36,25 +36,99 @@
+                 <property name="spacing">
+                     <number>3</number>
+                 </property>
+-                <widget class="QLabel" row="5" column="0">
++                <widget class="QToolButton" row="9" column="1">
+                     <property name="name">
+-                        <cstring>text_1</cstring>
++                        <cstring>pb_cAnimFront</cstring>
++                    </property>
++                    <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>Account Heading Background</string>
++                        <string></string>
+                     </property>
+                 </widget>
+-                <widget class="QLabel" row="7" column="0">
++                <widget class="QToolButton" row="11" column="1">
+                     <property name="name">
+-                        <cstring>text</cstring>
++                        <cstring>pb_cMsgBG</cstring>
++                    </property>
++                    <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>Group Heading Background</string>
++                        <string></string>
+                     </property>
+                 </widget>
+-                <widget class="QToolButton" row="8" column="1">
++                <widget class="QLabel" row="4" column="3">
+                     <property name="name">
+-                        <cstring>pb_cListBack</cstring>
++                        <cstring>TextLabel1_2_5_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Sent Chat Messages Nick</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="2" column="3">
++                    <property name="name">
++                        <cstring>text4_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>System Chat Messages</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="9" column="3">
++                    <property name="name">
++                        <cstring>text4_2_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>System Groupchat Messages</string>
++                    </property>
++                </widget>
++                <widget class="QToolButton" row="3" column="4">
++                    <property name="name">
++                        <cstring>pb_cChatSpool</cstring>
++                    </property>
++                    <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></string>
++                    </property>
++                </widget>
++                <widget class="QToolButton" row="10" column="4">
++                    <property name="name">
++                        <cstring>pb_cGChatSpool</cstring>
+                     </property>
+                     <property name="sizePolicy">
+                         <sizepolicy>
+@@ -96,33 +170,179 @@
+                         <string></string>
+                     </property>
+                 </widget>
+-                <widget class="QLabel" row="1" column="0">
++                <widget class="QToolButton" row="12" column="1">
+                     <property name="name">
+-                        <cstring>TextLabel1_2_3</cstring>
++                        <cstring>pb_cMsgText</cstring>
++                    </property>
++                    <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>Offline Contacts</string>
++                        <string></string>
+                     </property>
+                 </widget>
+-                <widget class="QLabel" row="2" column="0">
++                <widget class="QToolButton" row="0" column="4">
+                     <property name="name">
+-                        <cstring>TextLabel1_2</cstring>
++                        <cstring>pb_cChatBG</cstring>
++                    </property>
++                    <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>Away Contacts</string>
++                        <string></string>
+                     </property>
+                 </widget>
+-                <widget class="QLabel" row="0" column="0">
++                <widget class="QToolButton" row="6" column="4">
+                     <property name="name">
+-                        <cstring>TextLabel1_2_6</cstring>
++                        <cstring>pb_cGChatBG</cstring>
++                    </property>
++                    <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>Online Contacts</string>
++                        <string></string>
+                     </property>
+                 </widget>
+-                <widget class="QToolButton" row="5" column="1">
++                <widget class="QLabel" row="10" column="0">
+                     <property name="name">
+-                        <cstring>pb_cProfileBack</cstring>
++                        <cstring>TextLabel1_2_6_2_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Nick Animation Background</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="9" column="0">
++                    <property name="name">
++                        <cstring>TextLabel1_2_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Nick Animation Foreground</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="12" column="0">
++                    <property name="name">
++                        <cstring>TextLabel1_2_6_2_2_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Message Text</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="11" column="0">
++                    <property name="name">
++                        <cstring>TextLabel1_2_2_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Message Background</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="5" column="3">
++                    <property name="name">
++                        <cstring>text_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Received Chat Messages Nick</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="1" column="3">
++                    <property name="name">
++                        <cstring>text2_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Chat Message Text</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="7" column="3">
++                    <property name="name">
++                        <cstring>text2_2_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Groupchat Message Text</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="8" column="3">
++                    <property name="name">
++                        <cstring>text2_2_3</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Groupchat Alert Message</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="11" column="3">
++                    <property name="name">
++                        <cstring>text2_2_4</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Groupchat Nicks</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="3" column="3">
++                    <property name="name">
++                        <cstring>text3_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Spooled Chat Messages</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="10" column="3">
++                    <property name="name">
++                        <cstring>text3_2_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Spooled Groupchat Messages</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="0" column="3">
++                    <property name="name">
++                        <cstring>TextLabel1_2_5_1_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Chat Window Background</string>
++                    </property>
++                </widget>
++                <widget class="QLabel" row="6" column="3">
++                    <property name="name">
++                        <cstring>TextLabel1_2_5_1_2_2</cstring>
++                    </property>
++                    <property name="text">
++                        <string>Groupchat Window Background</string>
++                    </property>
++                </widget>
++                <widget class="QToolButton" row="5" column="4">
++                    <property name="name">
++                        <cstring>pb_cChatFrom</cstring>
+                     </property>
+                     <property name="sizePolicy">
+                         <sizepolicy>
+@@ -142,9 +362,9 @@
+                         <string></string>
+                     </property>
+                 </widget>
+-                <widget class="QToolButton" row="7" column="1">
++                <widget class="QToolButton" row="1" column="4">
+                     <property name="name">
+-                        <cstring>pb_cGroupBack</cstring>
++                        <cstring>pb_cChatMessage</cstring>
+                     </property>
+                     <property name="sizePolicy">
+                         <sizepolicy>
+@@ -164,9 +384,9 @@
+                         <string></string>
+                     </property>
+                 </widget>
+-                <widget class="QToolButton" row="3" column="1">
++                <widget class="QToolButton" row="7" column="4">
+                     <property name="name">
<<Diff was trimmed, longer than 597 lines>>


More information about the pld-cvs-commit mailing list