SOURCES: psi-status_indicator-add.patch - make icon update and alp...

hawk hawk at pld-linux.org
Sun Jan 27 16:15:58 CET 2008


Author: hawk                         Date: Sun Jan 27 15:15:58 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- make icon update and alpha channel update not overlap
- fixed small ui bug
- patch still have small glitch

---- Files affected:
SOURCES:
   psi-status_indicator-add.patch (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/psi-status_indicator-add.patch
diff -u SOURCES/psi-status_indicator-add.patch:1.12 SOURCES/psi-status_indicator-add.patch:1.13
--- SOURCES/psi-status_indicator-add.patch:1.12	Fri Jan 25 23:40:33 2008
+++ SOURCES/psi-status_indicator-add.patch	Sun Jan 27 16:15:52 2008
@@ -115,7 +115,7 @@
  	if ( icon ) {
  		if ( !alert )
  			d->icon = new PsiIcon(*icon);
-@@ -3403,16 +3405,47 @@
+@@ -3403,16 +3405,46 @@
  			connect(d->icon, SIGNAL(pixmapChanged()), SLOT(iconUpdated()));
  		}
  		d->icon->activated();
@@ -146,8 +146,6 @@
 +
 +		if(has_indicator) {
 +			const QPixmap &ipix = PsiIconset::instance()->indicator(d->u->jid()).pixmap();
-+			QPainter i(&out);
-+
 +			if(out.hasAlpha() && ipix.hasAlpha()) {
 +				// sum alpha channels
 +				QPixmap mask(out.alphaChannel());
@@ -158,6 +156,7 @@
 +					mask);
 +				out.setAlphaChannel(mask);
 +			}
++			QPainter i(&out);
 +			i.drawPixmap((out.width() - ipix.width()) / 2, (out.height() - ipix.height()) / 2,
 +				ipix);
 +		}
@@ -199,6 +198,15 @@
 diff -urN psi-0.11.orig/src/options/opt_appearance_misc.ui psi-0.11/src/options/opt_appearance_misc.ui
 --- psi-0.11.orig/src/options/opt_appearance_misc.ui	2007-10-14 16:00:52.000000000 +0200
 +++ psi-0.11/src/options/opt_appearance_misc.ui	2008-01-25 18:27:20.619079539 +0100
+@@ -9,7 +9,7 @@
+     <x>0</x>
+     <y>0</y>
+     <width>354</width>
+-    <height>189</height>
++    <height>255</height>
+    </rect>
+   </property>
+   <property name="windowTitle" >
 @@ -23,6 +23,28 @@
      <number>6</number>
     </property>
@@ -214,7 +222,7 @@
 +      <property name="spacing" >
 +       <number>6</number>
 +      </property>
-+      <item row="1" column="0" >
++      <item row="0" column="0" >
 +       <widget class="QCheckBox" name="ck_statusIndicator" >
 +        <property name="text">
 +         <string>Show indicator for text statuses</string>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/psi-status_indicator-add.patch?r1=1.12&r2=1.13&f=u



More information about the pld-cvs-commit mailing list