author | sandman <sandman> | 2002-09-21 01:31:23 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-21 01:31:23 (UTC) |
commit | 804a06520928973d706bf827209f8a7625010b7f (patch) (side-by-side diff) | |
tree | 06865733a58dbd033747ef6ceca9bd6c51f24455 /noncore/styles/liquid/liquid.cpp | |
parent | 6ae824e5c3a555d5129c68d387094d50276742f4 (diff) | |
download | opie-804a06520928973d706bf827209f8a7625010b7f.zip opie-804a06520928973d706bf827209f8a7625010b7f.tar.gz opie-804a06520928973d706bf827209f8a7625010b7f.tar.bz2 |
- disable liquid win decoration - this has to be made a separate plugin
- liquid now uses the polished palette for color values (liquid did parse
qpe.conf before -- the new Qt/e patch is needed for this to work)
- updated QPL diff
Diffstat (limited to 'noncore/styles/liquid/liquid.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index 22bf8af..0d9d259 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp @@ -687,3 +687,2 @@ void LiquidStyle::polish(QPalette &appPal) { - int i; @@ -720,3 +719,3 @@ void LiquidStyle::polish(QPalette &appPal) - QPalette pal = QApplication::palette(); +// QPalette pal = QApplication::palette(); @@ -724,4 +723,7 @@ void LiquidStyle::polish(QPalette &appPal) config. setGroup ( "Appearance" ); - QColor c = QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))); - if ( c == QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))) { + QColor c = // QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))); + appPal. color ( QPalette::Active, QColorGroup::Button ); + if ( c == appPal. color ( QPalette::Active, QColorGroup::Background ) + //QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( ))) + ) { // force button color to be different from background @@ -776,3 +778,3 @@ void LiquidStyle::polish(QPalette &appPal) // background color stuff - c = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( ))); + c = /*QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Background ); c.hsv(&bH, &bS, &bV); @@ -802,3 +804,3 @@ void LiquidStyle::polish(QPalette &appPal) // lineedits - c = QColor ( config. readEntry("Base", ( Qt::white). name ( ))); + c = /*QColor ( config. readEntry("Base", ( Qt::white). name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Base ); QPixmap basePix; @@ -827,3 +829,2 @@ void LiquidStyle::polish(QPalette &appPal) } - } @@ -950,3 +951,3 @@ void LiquidStyle::unPolish(QWidget *w) - w->setPalette(QApplication::palette()); + w->unsetPalette(); if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){ @@ -1007,4 +1008,4 @@ void LiquidStyle::polish(QApplication *app) - if ( config. readBoolEntry ( "WinDecoration", true )) - QApplication::qwsSetDecoration ( new LiquidDecoration ( )); +// if ( config. readBoolEntry ( "WinDecoration", true )) +// QApplication::qwsSetDecoration ( new LiquidDecoration ( )); @@ -1021,3 +1022,3 @@ void LiquidStyle::unPolish(QApplication *app) - QApplication::qwsSetDecoration ( new QPEDecoration ( )); +// QApplication::qwsSetDecoration ( new QPEDecoration ( )); } |