SOURCES: psi-nicechats-mod.patch - updated for 0.10
hawk
hawk at pld-linux.org
Fri Jan 20 03:35:20 CET 2006
Author: hawk Date: Fri Jan 20 02:35:20 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 0.10
---- Files affected:
SOURCES:
psi-nicechats-mod.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/psi-nicechats-mod.patch
diff -u SOURCES/psi-nicechats-mod.patch:1.3 SOURCES/psi-nicechats-mod.patch:1.4
--- SOURCES/psi-nicechats-mod.patch:1.3 Tue Jan 11 22:56:37 2005
+++ SOURCES/psi-nicechats-mod.patch Fri Jan 20 03:35:15 2006
@@ -1,21 +1,20 @@
-diff -ru -X exclude psi-clean/src/chatdlg.cpp psi/src/chatdlg.cpp
---- psi-clean/src/chatdlg.cpp Tue Jan 06 17:24:54 2004
-+++ psi/src/chatdlg.cpp Sat Mar 27 11:47:06 2004
-@@ -506,7 +507,13 @@
- // update the widget icon
- #ifdef Q_WS_MAC
- setIcon(IconsetFactory::icon("psi/chat"));
+diff -urN psi-0.10.orig/src/chatdlg.cpp psi-0.10/src/chatdlg.cpp
+--- psi-0.10.orig/src/chatdlg.cpp 2006-01-19 18:38:13.000000000 +0100
++++ psi-0.10/src/chatdlg.cpp 2006-01-19 18:41:28.796362000 +0100
+@@ -692,6 +692,12 @@
+ setIcon(IconsetFactory::icon("psi/start-chat"));
#endif
-+
+
+ d->log->setPaletteBackgroundColor(option.color[cChatBG]);
+ d->mle->setPaletteBackgroundColor(option.color[cChatBG]);
+
+ d->log->setPaletteForegroundColor(option.color[cChatMessage]);
+ d->mle->setPaletteForegroundColor(option.color[cChatMessage]);
- }
-
- void ChatDlg::optionsUpdate()
-@@ -739,7 +746,7 @@
++
+ /*QBrush brush;
+ brush.setPixmap( QPixmap( option.chatBgImage ) );
+ d->log->setPaper(brush);
+@@ -933,7 +939,7 @@
y = 0;
bool atBottom = (d->log->contentsY() < y - 32) ? false: true;
@@ -24,7 +23,7 @@
if(atBottom)
deferredScroll();
}
-@@ -750,14 +757,14 @@
+@@ -944,14 +950,14 @@
if(local) {
who = d->pa->nick();
@@ -42,7 +41,7 @@
// figure out the encryption state
bool encChanged = false;
-@@ -786,8 +793,12 @@
+@@ -980,8 +986,12 @@
}
QString timestr;
@@ -57,7 +56,7 @@
int y = d->log->contentsHeight() - d->log->visibleHeight();
if(y < 0)
-@@ -809,16 +819,19 @@
+@@ -1003,16 +1013,19 @@
if(option.useEmoticons)
txt = emoticonify(txt);
@@ -80,911 +79,552 @@
}
if(!m.subject().isEmpty()) {
d->log->append(QString("<b>") + tr("Subject:") + "</b> " + QString("%1").arg(expandEntities(m.subject())));
-diff -ru -X exclude psi-clean/src/common.h psi/src/common.h
---- psi-clean/src/common.h Thu Mar 04 23:04:00 2004
-+++ psi/src/common.h Sat Mar 27 11:25:56 2004
-@@ -67,14 +67,14 @@
- extern bool use_gpg, no_gpg_agent;
+diff -urN psi-0.10.orig/src/common.h psi-0.10/src/common.h
+--- psi-0.10.orig/src/common.h 2006-01-19 18:38:13.000000000 +0100
++++ psi-0.10/src/common.h 2006-01-20 03:12:50.212032000 +0100
+@@ -69,14 +69,14 @@
+ extern uint psi_dialog_flags;
// options stuff
--enum { cOnline, cOffline, cAway, cDND, cGroupFore, cGroupBack, cListBack, cAnimFront, cAnimBack };
-+enum { cOnline, cOffline, cAway, cDND, cGroupFore, cGroupBack, cListBack, cAnimFront, cAnimBack, cChatMessage, cChatSys, cChatTo, cChatFrom, cChatSpool, cChatBG, colorLast };
+-enum { cOnline, cOffline, cAway, cDND, cProfileFore, cProfileBack, cGroupFore, cGroupBack, cListBack, cAnimFront, cAnimBack };
++enum { cOnline, cOffline, cAway, cDND, cProfileFore, cProfileBack, cGroupFore, cGroupBack, cListBack, cAnimFront, cAnimBack, cChatBG, cChatMessage, cChatTo, cChatFrom, cChatSys, cChatSpool, 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[9];
+- 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;
-@@ -109,1 +109,1 @@
+@@ -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;
-diff -ru -X exclude psi-clean/src/options/opt_appearance-ui.ui psi/src/options/opt_appearance-ui.ui
---- psi-clean/src/options/opt_appearance-ui.ui Thu Dec 11 17:44:18 2003
-+++ psi/src/options/opt_appearance-ui.ui Sat Mar 27 11:25:56 2004
-@@ -37,284 +37,525 @@
- <property name="title">
- <string>Colors</string>
- </property>
-- <grid>
-+ <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
+
+ QSize sizeEventDlg, sizeChatDlg, sizeTabDlg;
+ bool jidComplete, grabUrls, noGCSound;
+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-19 18:38:13.000000000 +0100
++++ psi-0.10/src/options/opt_appearance.cpp 2006-01-20 03:10:13.512032000 +0100
+@@ -210,6 +210,12 @@
+ 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_cChatBG, 11);
++ bg_color->insert(d->pb_cChatMessage, 12);
++ bg_color->insert(d->pb_cChatTo, 13);
++ bg_color->insert(d->pb_cChatFrom, 14);
++ bg_color->insert(d->pb_cChatSys, 15);
++ bg_color->insert(d->pb_cChatSpool, 16);
+ 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\".");
+@@ -231,6 +237,18 @@
+ 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 color for the chat window."));
++ QWhatsThis::add(d->pb_cChatMessage,
++ tr("Specifies the color for chat message text."));
++ QWhatsThis::add(d->pb_cChatTo,
++ tr("Specifies the color for sent chat messages."));
++ QWhatsThis::add(d->pb_cChatFrom,
++ tr("Specifies the color for recieved 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->ck_statusIndicator,
+ tr("Displays an indicator by the contact name if the contact entered a descriptive text status line."));
+
+@@ -254,7 +272,7 @@
+ for (n = 0; n < 4; ++n)
+ opt->font[n] = le_font[n]->fontName();
+
+- for (n = 0; n < 11; ++n)
++ for (n = 0; n < 17; ++n)
+ opt->color[n] = o->color[n];
+ }
+
+@@ -271,7 +289,7 @@
+ for (n = 0; n < 4; ++n)
+ le_font[n]->setFont(opt->font[n]);
+
+- for (n = 0; n < 11; ++n) {
++ for (n = 0; n < 17; ++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 2006-01-19 18:38:13.000000000 +0100
++++ psi-0.10/src/options/opt_appearance-ui.ui 2006-01-20 03:08:46.082032000 +0100
+@@ -36,25 +36,47 @@
<property name="spacing">
<number>3</number>
</property>
- <widget class="QLabel" row="5" column="0">
-- <property name="name">
++ <widget class="QToolButton" row="0" column="4">
+ <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="QLabel" row="4" column="3">
+ <property name="name">
- <cstring>text</cstring>
-- </property>
-- <property name="text">
-- <string>Group Background</string>
-- </property>
-- </widget>
-- <widget class="QToolButton" row="6" column="1">
-- <property name="name">
-- <cstring>pb_cListBack</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>
++ <cstring>TextLabel1_2_5_2</cstring>
+ </property>
+ <property name="text">
+- <string>Group Heading Background</string>
++ <string>Sent Chat Messages</string>
+ </property>
+ </widget>
- <widget class="QToolButton" row="8" column="1">
-- <property name="name">
-- <cstring>pb_cAnimBack</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="QLabel" row="6" column="3">
+ <property name="name">
+- <cstring>pb_cListBack</cstring>
++ <cstring>text4_2</cstring>
++ </property>
++ <property name="text">
++ <string>System Chat Messages</string>
++ </property>
++ </widget>
++ <widget class="QToolButton" row="7" column="4">
++ <property name="name">
++ <cstring>pb_cChatSpool</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+@@ -74,7 +96,7 @@
+ <string></string>
+ </property>
+ </widget>
+- <widget class="QToolButton" row="10" column="1">
++ <widget class="QToolButton" row="1" column="4">
+ <property name="name">
+ <cstring>pb_cAnimBack</cstring>
+ </property>
+@@ -96,33 +118,79 @@
+ <string></string>
+ </property>
+ </widget>
- <widget class="QLabel" row="1" column="0">
-- <property name="name">
++ <widget class="QToolButton" row="2" column="4">
+ <property name="name">
- <cstring>TextLabel1_2_3</cstring>
-- </property>
-- <property name="text">
-- <string>Offline</string>
-- </property>
-- </widget>
++ <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>Offline Contacts</string>
++ <string></string>
+ </property>
+ </widget>
- <widget class="QLabel" row="2" column="0">
-- <property name="name">
++ <widget class="QLabel" row="1" column="3">
+ <property name="name">
- <cstring>TextLabel1_2</cstring>
-- </property>
-- <property name="text">
-- <string>Away</string>
-- </property>
-- </widget>
++ <cstring>TextLabel1_2_6_2_2</cstring>
+ </property>
+ <property name="text">
+- <string>Away Contacts</string>
++ <string>Nick Animation Background</string>
+ </property>
+ </widget>
- <widget class="QLabel" row="0" column="0">
-- <property name="name">
++ <widget class="QLabel" row="0" column="3">
+ <property name="name">
- <cstring>TextLabel1_2_6</cstring>
-- </property>
-- <property name="text">
-- <string>Online</string>
-- </property>
-- </widget>
++ <cstring>TextLabel1_2_2</cstring>
+ </property>
+ <property name="text">
+- <string>Online Contacts</string>
++ <string>Nick Animation Foreground</string>
+ </property>
+ </widget>
- <widget class="QToolButton" row="5" column="1">
-- <property name="name">
++ <widget class="QLabel" row="5" column="3">
+ <property name="name">
+- <cstring>pb_cProfileBack</cstring>
++ <cstring>text_2</cstring>
++ </property>
++ <property name="text">
++ <string>Received Chat Messages</string>
++ </property>
++ </widget>
++ <widget class="QLabel" row="3" 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>text3_2</cstring>
++ </property>
++ <property name="text">
++ <string>Spooled Chat Messages</string>
++ </property>
++ </widget>
++ <widget class="QLabel" row="2" 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="QToolButton" row="5" column="4">
++ <property name="name">
++ <cstring>pb_cChatFrom</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+@@ -142,9 +210,9 @@
+ <string></string>
+ </property>
+ </widget>
+- <widget class="QToolButton" row="7" column="1">
++ <widget class="QToolButton" row="3" column="4">
+ <property name="name">
- <cstring>pb_cGroupBack</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>
++ <cstring>pb_cChatMessage</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+@@ -164,9 +232,9 @@
+ <string></string>
+ </property>
+ </widget>
- <widget class="QToolButton" row="3" column="1">
-- <property name="name">
++ <widget class="QToolButton" row="4" column="4">
+ <property name="name">
- <cstring>pb_cDND</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>
++ <cstring>pb_cChatTo</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+@@ -186,9 +254,9 @@
+ <string></string>
+ </property>
+ </widget>
- <widget class="QToolButton" row="1" column="1">
-- <property name="name">
++ <widget class="QToolButton" row="6" column="4">
+ <property name="name">
- <cstring>pb_cOffline</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>
++ <cstring>pb_cChatSys</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+@@ -208,9 +276,9 @@
+ <string></string>
+ </property>
+ </widget>
- <widget class="QToolButton" row="4" column="1">
-- <property name="name">
-- <cstring>pb_cGroupFore</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="7" column="1">
-+ <widget class="QLayoutWidget">
++ <widget class="QToolButton" row="2" column="1">
<property name="name">
-- <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></string>
-+ <cstring>layout1</cstring>
- </property>
-+ <grid>
-+ <property name="name">
-+ <cstring>unnamed</cstring>
-+ </property>
-+ <widget class="QLabel" row="5" column="0">
-+ <property name="name">
-+ <cstring>text</cstring>
-+ </property>
-+ <property name="text">
-+ <string>Group Background</string>
-+ </property>
-+ </widget>
-+ <widget class="QToolButton" row="0" column="1">
-+ <property name="name">
-+ <cstring>pb_cOnline</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="QLabel" row="7" column="0">
-+ <property name="name">
-+ <cstring>text3</cstring>
-+ </property>
-+ <property name="text">
-+ <string>Nick Anim Foreground</string>
-+ </property>
-+ </widget>
-+ <widget class="QLabel" row="6" column="0">
-+ <property name="name">
-+ <cstring>text2</cstring>
-+ </property>
-+ <property name="text">
-+ <string>List Background</string>
-+ </property>
-+ </widget>
-+ <widget class="QToolButton" row="3" column="1">
-+ <property name="name">
-+ <cstring>pb_cDND</cstring>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/psi-nicechats-mod.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list