krusader-commits Mailing List for Krusader (Page 11)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6061
          http://krusader.svn.sourceforge.net/krusader/?rev=6061&view=rev
Author:   ckarai
Date:     2008-08-12 21:26:34 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
FIXED: [ 2017011 ] Crash when changing the Qt theme

Modified Paths:
--------------
    trunk/krusader_kde4/ChangeLog
    trunk/krusader_kde4/krusader/GUI/krlistwidget.cpp
    trunk/krusader_kde4/krusader/GUI/krstyleproxy.cpp
    trunk/krusader_kde4/krusader/GUI/krstyleproxy.h
    trunk/krusader_kde4/krusader/GUI/krtreewidget.cpp
    trunk/krusader_kde4/krusader/Panel/krview.cpp

Modified: trunk/krusader_kde4/ChangeLog
===================================================================

--- trunk/krusader_kde4/ChangeLog	2008-08-12 19:45:52 UTC (rev 6060)
+++ trunk/krusader_kde4/ChangeLog	2008-08-12 21:26:34 UTC (rev 6061)
@@ -1,6 +1,7 @@
     ADDED: Useractions: added checkbox "enabled"
            and run mode option "Run in embedded terminal emulator"
 
+    FIXED: [ 2017011 ] Crash when changing the Qt theme
     FIXED: icons for symlinks are corrupted
     FIXED: [ 2023599 ] start root mode Krusader works again (thanks to gladiac)
     FIXED: [ 1980765 ] error at creating ../dir directory

Modified: trunk/krusader_kde4/krusader/GUI/krlistwidget.cpp
===================================================================
--- trunk/krusader_kde4/krusader/GUI/krlistwidget.cpp	2008-08-12 19:45:52 UTC (rev 6060)
+++ trunk/krusader_kde4/krusader/GUI/krlistwidget.cpp	2008-08-12 21:26:34 UTC (rev 6061)
@@ -34,7 +34,7 @@
 #include <qevent.h>
 
 KrListWidget::KrListWidget( QWidget * parent ) : QListWidget( parent ) {
-  setStyle( new KrStyleProxy( style() ) );
+  setStyle( new KrStyleProxy() );
 }
 
 bool KrListWidget::event ( QEvent * event )

Modified: trunk/krusader_kde4/krusader/GUI/krstyleproxy.cpp
===================================================================
--- trunk/krusader_kde4/krusader/GUI/krstyleproxy.cpp	2008-08-12 19:45:52 UTC (rev 6060)
+++ trunk/krusader_kde4/krusader/GUI/krstyleproxy.cpp	2008-08-12 21:26:34 UTC (rev 6061)
@@ -32,25 +32,22 @@
 #include <qpen.h>
 #include <qpainter.h>
 #include <QStyleOptionViewItem>
+#include <qapplication.h>
 
-KrStyleProxy::KrStyleProxy( QStyle * style ) {
-  _style = style;
-}
-
 void KrStyleProxy::drawComplexControl ( ComplexControl control, const QStyleOptionComplex * option, QPainter * painter, const QWidget * widget ) const {
-  _style->drawComplexControl( control, option, painter, widget );
+  QApplication::style()->drawComplexControl( control, option, painter, widget );
 }
 
 void KrStyleProxy::drawControl ( ControlElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget ) const {
-  _style->drawControl( element, option, painter, widget );
+  QApplication::style()->drawControl( element, option, painter, widget );
 }
 
 void KrStyleProxy::drawItemPixmap ( QPainter * painter, const QRect & rectangle, int alignment, const QPixmap & pixmap ) const {
-  _style->drawItemPixmap( painter, rectangle, alignment, pixmap );
+  QApplication::style()->drawItemPixmap( painter, rectangle, alignment, pixmap );
 }
 
 void KrStyleProxy::drawItemText ( QPainter * painter, const QRect & rectangle, int alignment, const QPalette & palette, bool enabled, const QString & text, QPalette::ColorRole textRole ) const {
-  _style->drawItemText( painter, rectangle, alignment, palette, enabled, text, textRole );
+  QApplication::style()->drawItemText( painter, rectangle, alignment, palette, enabled, text, textRole );
 }
 
 void KrStyleProxy::drawPrimitive ( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget ) const {
@@ -78,69 +75,69 @@
       }
   }
   else
-    _style->drawPrimitive( element, option, painter, widget );
+    QApplication::style()->drawPrimitive( element, option, painter, widget );
 }
 
 QPixmap KrStyleProxy::generatedIconPixmap ( QIcon::Mode iconMode, const QPixmap & pixmap, const QStyleOption * option ) const {
-  return _style->generatedIconPixmap( iconMode, pixmap, option );
+  return QApplication::style()->generatedIconPixmap( iconMode, pixmap, option );
 }
 
 QStyle::SubControl KrStyleProxy::hitTestComplexControl ( ComplexControl control, const QStyleOptionComplex * option, const QPoint & position, const QWidget * widget ) const {
-  return _style->hitTestComplexControl ( control, option, position, widget );
+  return QApplication::style()->hitTestComplexControl ( control, option, position, widget );
 }
 
 QRect KrStyleProxy::itemPixmapRect ( const QRect & rectangle, int alignment, const QPixmap & pixmap ) const {
-  return _style->itemPixmapRect ( rectangle, alignment, pixmap );
+  return QApplication::style()->itemPixmapRect ( rectangle, alignment, pixmap );
 }
 
 QRect KrStyleProxy::itemTextRect ( const QFontMetrics & metrics, const QRect & rectangle, int alignment, bool enabled, const QString & text ) const {
-  return _style->itemTextRect ( metrics, rectangle, alignment, enabled, text );
+  return QApplication::style()->itemTextRect ( metrics, rectangle, alignment, enabled, text );
 }
 
 int KrStyleProxy::pixelMetric ( PixelMetric metric, const QStyleOption * option, const QWidget * widget ) const {
-  return _style->pixelMetric ( metric, option, widget );
+  return QApplication::style()->pixelMetric ( metric, option, widget );
 }
 
 void KrStyleProxy::polish ( QWidget * widget ) {
-  _style->polish( widget );
+  QApplication::style()->polish( widget );
 }
 
 void KrStyleProxy::polish ( QApplication * application ) {
-  _style->polish( application );
+  QApplication::style()->polish( application );
 }
 
 void KrStyleProxy::polish ( QPalette & palette ) {
-  _style->polish( palette );
+  QApplication::style()->polish( palette );
 }
 
 QSize KrStyleProxy::sizeFromContents ( ContentsType type, const QStyleOption * option, const QSize & contentsSize, const QWidget * widget ) const {
-  return _style->sizeFromContents ( type, option, contentsSize, widget );
+  return QApplication::style()->sizeFromContents ( type, option, contentsSize, widget );
 }
 
 QPalette KrStyleProxy::standardPalette () const {
-  return _style->standardPalette ();
+  return QApplication::style()->standardPalette ();
 }
 
 int KrStyleProxy::styleHint ( StyleHint hint, const QStyleOption * option, const QWidget * widget, QStyleHintReturn * returnData ) const {
-  return _style->styleHint( hint, option, widget, returnData );
+  return QApplication::style()->styleHint( hint, option, widget, returnData );
 }
 
 QRect KrStyleProxy::subControlRect ( ComplexControl control, const QStyleOptionComplex * option, SubControl subControl, const QWidget * widget ) const {
-  return _style->subControlRect ( control, option, subControl, widget );
+  return QApplication::style()->subControlRect ( control, option, subControl, widget );
 }
 
 QRect KrStyleProxy::subElementRect ( SubElement element, const QStyleOption * option, const QWidget * widget ) const {
-  return _style->subElementRect ( element, option, widget );
+  return QApplication::style()->subElementRect ( element, option, widget );
 }
 
 QPixmap KrStyleProxy::standardPixmap(QStyle::StandardPixmap pixmap, const QStyleOption* option, const QWidget*widget) const {
-  return _style->standardPixmap ( pixmap, option, widget );
+  return QApplication::style()->standardPixmap ( pixmap, option, widget );
 }
 
 void KrStyleProxy::unpolish ( QWidget * widget ) {
-  _style->unpolish( widget );
+  QApplication::style()->unpolish( widget );
 }
 
 void KrStyleProxy::unpolish ( QApplication * application ) {
-  _style->unpolish( application );
+  QApplication::style()->unpolish( application );
 }

Modified: trunk/krusader_kde4/krusader/GUI/krstyleproxy.h
===================================================================
--- trunk/krusader_kde4/krusader/GUI/krstyleproxy.h	2008-08-12 19:45:52 UTC (rev 6060)
+++ trunk/krusader_kde4/krusader/GUI/krstyleproxy.h	2008-08-12 21:26:34 UTC (rev 6061)
@@ -39,7 +39,7 @@
 
 class KrStyleProxy: public QStyle {
 public:
-  KrStyleProxy( QStyle * style );
+  KrStyleProxy() {}
   virtual void drawComplexControl( ComplexControl control, const QStyleOptionComplex * option, QPainter * painter, const QWidget * widget = 0 ) const;
   virtual void drawControl ( ControlElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget = 0 ) const;
   virtual void drawItemPixmap ( QPainter * painter, const QRect & rectangle, int alignment, const QPixmap & pixmap ) const;
@@ -61,9 +61,6 @@
   virtual QPixmap standardPixmap(QStyle::StandardPixmap pixmap, const QStyleOption* option, const QWidget*widget = 0) const;
   virtual void unpolish ( QWidget * widget );
   virtual void unpolish ( QApplication * application );
-
-protected:
-  QStyle * _style;
 };
 
 

Modified: trunk/krusader_kde4/krusader/GUI/krtreewidget.cpp
===================================================================
--- trunk/krusader_kde4/krusader/GUI/krtreewidget.cpp	2008-08-12 19:45:52 UTC (rev 6060)
+++ trunk/krusader_kde4/krusader/GUI/krtreewidget.cpp	2008-08-12 21:26:34 UTC (rev 6061)
@@ -43,7 +43,7 @@
 
   _stretchingColumn = -1;
 
-  setStyle( new KrStyleProxy( style() ) );
+  setStyle( new KrStyleProxy() );
 }
 
 bool KrTreeWidget::event ( QEvent * event )

Modified: trunk/krusader_kde4/krusader/Panel/krview.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krview.cpp	2008-08-12 19:45:52 UTC (rev 6060)
+++ trunk/krusader_kde4/krusader/Panel/krview.cpp	2008-08-12 21:26:34 UTC (rev 6061)
@@ -120,7 +120,7 @@
 		// bitBlt ( &icon, 0, icon.height() - 11, &link, 0, 21, 10, 11, Qt::CopyROP, false );
 		QPainter painter( &icon );
 		painter.drawPixmap( 0, icon.height() - 11, link, 0, 21, 10, 11 );
-		icon.setMask( icon.createHeuristicMask( false ) );
+		//icon.setMask( icon.createHeuristicMask( false ) );
 	}
 
 	return icon;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (98)	Sep (138)	Oct (100)	Nov (49)	Dec (131)
2004	Jan (94)	Feb (65)	Mar (100)	Apr (83)	May (72)	Jun (29)	Jul (167)	Aug (127)	Sep (131)	Oct (269)	Nov (122)	Dec (100)
2005	Jan (228)	Feb (266)	Mar (63)	Apr (135)	May (157)	Jun (52)	Jul (25)	Aug (49)	Sep (184)	Oct (159)	Nov (75)	Dec (37)
2006	Jan (60)	Feb (129)	Mar (110)	Apr (34)	May (31)	Jun (42)	Jul (72)	Aug (90)	Sep (57)	Oct (66)	Nov (42)	Dec (90)
2007	Jan (106)	Feb (54)	Mar (93)	Apr (27)	May (21)	Jun (17)	Jul (19)	Aug (22)	Sep (25)	Oct (2)	Nov (1)	Dec (1)
2008	Jan (65)	Feb (70)	Mar (29)	Apr (45)	May (91)	Jun (20)	Jul (11)	Aug (24)	Sep (23)	Oct (13)	Nov (23)	Dec (39)
2009	Jan (23)	Feb (39)	Mar (15)	Apr (56)	May (5)	Jun	Jul	Aug	Sep	Oct	Nov	Dec