summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-21 01:31:23 (UTC)
committer sandman <sandman>2002-09-21 01:31:23 (UTC)
commit804a06520928973d706bf827209f8a7625010b7f (patch) (unidiff)
tree06865733a58dbd033747ef6ceca9bd6c51f24455
parent6ae824e5c3a555d5129c68d387094d50276742f4 (diff)
downloadopie-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 (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.cpp23
-rw-r--r--noncore/styles/liquid/opie-liquid.diff128
2 files changed, 87 insertions, 64 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
@@ -640,237 +640,238 @@ QPixmap* LiquidStyle::getPixmap(BitmapData item)
640 pixmaps[HSBSliderBtm] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true); 640 pixmaps[HSBSliderBtm] = processEmbedded("sbslider_btm", btnH, btnS, btnV, true);
641 *pixmaps[HSBSliderBtm] = pixmaps[HSBSliderBtm]->xForm(rMatrix); 641 *pixmaps[HSBSliderBtm] = pixmaps[HSBSliderBtm]->xForm(rMatrix);
642 break; 642 break;
643 case HSBSliderMid: 643 case HSBSliderMid:
644 pixmaps[HSBSliderMid] = processEmbedded("sbslider_mid", btnH, btnS, btnV); 644 pixmaps[HSBSliderMid] = processEmbedded("sbslider_mid", btnH, btnS, btnV);
645 *pixmaps[HSBSliderMid] = pixmaps[HSBSliderMid]->xForm(rMatrix); 645 *pixmaps[HSBSliderMid] = pixmaps[HSBSliderMid]->xForm(rMatrix);
646 break; 646 break;
647 case HSBSliderTopHover: 647 case HSBSliderTopHover:
648 pixmaps[HSBSliderTopHover] = processEmbedded("sbslider_top", btnHoverH, btnHoverS, btnHoverV, true); 648 pixmaps[HSBSliderTopHover] = processEmbedded("sbslider_top", btnHoverH, btnHoverS, btnHoverV, true);
649 *pixmaps[HSBSliderTopHover] = pixmaps[HSBSliderTopHover]->xForm(rMatrix); 649 *pixmaps[HSBSliderTopHover] = pixmaps[HSBSliderTopHover]->xForm(rMatrix);
650 break; 650 break;
651 case HSBSliderBtmHover: 651 case HSBSliderBtmHover:
652 pixmaps[HSBSliderBtmHover] = processEmbedded("sbslider_btm", btnHoverH, btnHoverS, btnHoverV, true); 652 pixmaps[HSBSliderBtmHover] = processEmbedded("sbslider_btm", btnHoverH, btnHoverS, btnHoverV, true);
653 *pixmaps[HSBSliderBtmHover] = pixmaps[HSBSliderBtmHover]->xForm(rMatrix); 653 *pixmaps[HSBSliderBtmHover] = pixmaps[HSBSliderBtmHover]->xForm(rMatrix);
654 break; 654 break;
655 case HSBSliderMidHover: 655 case HSBSliderMidHover:
656 pixmaps[HSBSliderMidHover] = processEmbedded("sbslider_mid", btnHoverH, btnHoverS, btnHoverV); 656 pixmaps[HSBSliderMidHover] = processEmbedded("sbslider_mid", btnHoverH, btnHoverS, btnHoverV);
657 *pixmaps[HSBSliderMidHover] = pixmaps[HSBSliderMidHover]->xForm(rMatrix); 657 *pixmaps[HSBSliderMidHover] = pixmaps[HSBSliderMidHover]->xForm(rMatrix);
658 break; 658 break;
659 case VSBSliderTopBg: 659 case VSBSliderTopBg:
660 pixmaps[VSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true); 660 pixmaps[VSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true);
661 break; 661 break;
662 case VSBSliderBtmBg: 662 case VSBSliderBtmBg:
663 pixmaps[VSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true); 663 pixmaps[VSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true);
664 break; 664 break;
665 case VSBSliderMidBg: 665 case VSBSliderMidBg:
666 pixmaps[VSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV); 666 pixmaps[VSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
667 break; 667 break;
668 case HSBSliderTopBg: 668 case HSBSliderTopBg:
669 pixmaps[HSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true); 669 pixmaps[HSBSliderTopBg] = processEmbedded("sbslider_top", bH, bS, bV, true);
670 *pixmaps[HSBSliderTopBg] = pixmaps[HSBSliderTopBg]->xForm(rMatrix); 670 *pixmaps[HSBSliderTopBg] = pixmaps[HSBSliderTopBg]->xForm(rMatrix);
671 break; 671 break;
672 case HSBSliderBtmBg: 672 case HSBSliderBtmBg:
673 pixmaps[HSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true); 673 pixmaps[HSBSliderBtmBg] = processEmbedded("sbslider_btm", bH, bS, bV, true);
674 *pixmaps[HSBSliderBtmBg] = pixmaps[HSBSliderBtmBg]->xForm(rMatrix); 674 *pixmaps[HSBSliderBtmBg] = pixmaps[HSBSliderBtmBg]->xForm(rMatrix);
675 break; 675 break;
676 case HSBSliderMidBg: 676 case HSBSliderMidBg:
677 pixmaps[HSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV); 677 pixmaps[HSBSliderMidBg] = processEmbedded("sbslider_mid", bH, bS, bV);
678 *pixmaps[HSBSliderMidBg] = pixmaps[HSBSliderMidBg]->xForm(rMatrix); 678 *pixmaps[HSBSliderMidBg] = pixmaps[HSBSliderMidBg]->xForm(rMatrix);
679 break; 679 break;
680 default: 680 default:
681 break; 681 break;
682 } 682 }
683 return(pixmaps[item]); 683 return(pixmaps[item]);
684} 684}
685 685
686void LiquidStyle::polish(QPalette &appPal) 686void LiquidStyle::polish(QPalette &appPal)
687{ 687{
688
689 int i; 688 int i;
690 for(i=0; i < BITMAP_ITEMS; ++i){ 689 for(i=0; i < BITMAP_ITEMS; ++i){
691 if(pixmaps[i]){ 690 if(pixmaps[i]){
692 delete pixmaps[i]; 691 delete pixmaps[i];
693 pixmaps[i] = NULL; 692 pixmaps[i] = NULL;
694 } 693 }
695 } 694 }
696 QWidgetList *list = QApplication::allWidgets(); 695 QWidgetList *list = QApplication::allWidgets();
697 QWidgetListIt it( *list ); 696 QWidgetListIt it( *list );
698 QWidget *w; 697 QWidget *w;
699 while ((w=it.current()) != 0 ){ 698 while ((w=it.current()) != 0 ){
700 ++it; 699 ++it;
701 if(w->inherits("QPushButton")){ 700 if(w->inherits("QPushButton")){
702 unapplyCustomAttributes((QPushButton *)w); 701 unapplyCustomAttributes((QPushButton *)w);
703 } 702 }
704 } 703 }
705 704
706 loadCustomButtons(); 705 loadCustomButtons();
707 lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10; 706 lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10;
708 btnDict.clear(); 707 btnDict.clear();
709 btnBorderDict.clear(); 708 btnBorderDict.clear();
710 bevelFillDict.clear(); 709 bevelFillDict.clear();
711 smallBevelFillDict.clear(); 710 smallBevelFillDict.clear();
712 711
713 Config config ( "qpe" ); 712 Config config ( "qpe" );
714 config. setGroup ( "Liquid-Style" ); 713 config. setGroup ( "Liquid-Style" );
715 int contrast = config. readNumEntry ( "StippleContrast", 5 ); 714 int contrast = config. readNumEntry ( "StippleContrast", 5 );
716 if ( contrast < 0 ) 715 if ( contrast < 0 )
717 contrast = 0; 716 contrast = 0;
718 else if ( contrast > 10 ) 717 else if ( contrast > 10 )
719 contrast = 10; 718 contrast = 10;
720 719
721 QPalette pal = QApplication::palette(); 720// QPalette pal = QApplication::palette();
722 721
723 // button color stuff 722 // button color stuff
724 config. setGroup ( "Appearance" ); 723 config. setGroup ( "Appearance" );
725 QColor c = QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))); 724 QColor c = // QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( )));
726 if ( c == QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))) { 725 appPal. color ( QPalette::Active, QColorGroup::Button );
726 if ( c == appPal. color ( QPalette::Active, QColorGroup::Background )
727 //QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))
728 ) {
727 // force button color to be different from background 729 // force button color to be different from background
728 QBrush btnBrush(QColor(200, 202, 228)); 730 QBrush btnBrush(QColor(200, 202, 228));
729 appPal.setBrush(QColorGroup::Button, btnBrush); 731 appPal.setBrush(QColorGroup::Button, btnBrush);
730 } 732 }
731 c.hsv(&btnH, &btnS, &btnV); 733 c.hsv(&btnH, &btnS, &btnV);
732 c.light(120).hsv(&btnHoverH, &btnHoverS, &btnHoverV); 734 c.light(120).hsv(&btnHoverH, &btnHoverS, &btnHoverV);
733 735
734 // menu pixmap 736 // menu pixmap
735 if(!menuPix){ 737 if(!menuPix){
736 menuPix = new QPixmap; 738 menuPix = new QPixmap;
737 menuPix->resize(64, 64); 739 menuPix->resize(64, 64);
738 } 740 }
739 QPainter painter; 741 QPainter painter;
740 menuPix->fill(c.rgb()); 742 menuPix->fill(c.rgb());
741 painter.begin(menuPix); 743 painter.begin(menuPix);
742 painter.setPen(c.dark(105)); 744 painter.setPen(c.dark(105));
743 for(i=0; i < 63; i+=4){ 745 for(i=0; i < 63; i+=4){
744 painter.drawLine(0, i, 63, i); 746 painter.drawLine(0, i, 63, i);
745 painter.drawLine(0, i+1, 63, i+1); 747 painter.drawLine(0, i+1, 63, i+1);
746 }; 748 };
747 painter.end(); 749 painter.end();
748 menuBrush.setColor(c); 750 menuBrush.setColor(c);
749 menuBrush.setPixmap(*menuPix); 751 menuBrush.setPixmap(*menuPix);
750 752
751 // pager brush 753 // pager brush
752 c = c.dark(120); 754 c = c.dark(120);
753 QPixmap *pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-) 755 QPixmap *pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
754 if(!pix){ 756 if(!pix){
755 int h, s, v; 757 int h, s, v;
756 c.hsv(&h, &s, &v); 758 c.hsv(&h, &s, &v);
757 pix = new QPixmap(*smallBevelFillPix); 759 pix = new QPixmap(*smallBevelFillPix);
758 adjustHSV(*pix, h, s, v); 760 adjustHSV(*pix, h, s, v);
759 smallBevelFillDict.insert(c.rgb(), pix); 761 smallBevelFillDict.insert(c.rgb(), pix);
760 } 762 }
761 pagerHoverBrush.setColor(c); 763 pagerHoverBrush.setColor(c);
762 pagerHoverBrush.setPixmap(*pix); 764 pagerHoverBrush.setPixmap(*pix);
763 765
764 c = c.dark(120); 766 c = c.dark(120);
765 pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-) 767 pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
766 if(!pix){ 768 if(!pix){
767 int h, s, v; 769 int h, s, v;
768 c.hsv(&h, &s, &v); 770 c.hsv(&h, &s, &v);
769 pix = new QPixmap(*smallBevelFillPix); 771 pix = new QPixmap(*smallBevelFillPix);
770 adjustHSV(*pix, h, s, v); 772 adjustHSV(*pix, h, s, v);
771 smallBevelFillDict.insert(c.rgb(), pix); 773 smallBevelFillDict.insert(c.rgb(), pix);
772 } 774 }
773 pagerBrush.setColor(c); 775 pagerBrush.setColor(c);
774 pagerBrush.setPixmap(*pix); 776 pagerBrush.setPixmap(*pix);
775 777
776 // background color stuff 778 // background color stuff
777 c = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( ))); 779 c = /*QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Background );
778 c.hsv(&bH, &bS, &bV); 780 c.hsv(&bH, &bS, &bV);
779 c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); 781 c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV);
780 782
781 // FIXME? 783 // FIXME?
782 if(vsbSliderFillPix) 784 if(vsbSliderFillPix)
783 delete vsbSliderFillPix; 785 delete vsbSliderFillPix;
784 vsbSliderFillPix = new QPixmap(bevelFillPix->xForm(rMatrix)); 786 vsbSliderFillPix = new QPixmap(bevelFillPix->xForm(rMatrix));
785 adjustHSV(*vsbSliderFillPix, bH, bS, bV); 787 adjustHSV(*vsbSliderFillPix, bH, bS, bV);
786 788
787 // background brush 789 // background brush
788 QPixmap wallPaper(32, 32); 790 QPixmap wallPaper(32, 32);
789 wallPaper.fill(c.rgb()); 791 wallPaper.fill(c.rgb());
790 painter.begin(&wallPaper); 792 painter.begin(&wallPaper);
791 for(i=0; i < 32; i+=4){ 793 for(i=0; i < 32; i+=4){
792 painter.setPen(c.dark(100 + contrast)); 794 painter.setPen(c.dark(100 + contrast));
793 painter.drawLine(0, i, 32, i); 795 painter.drawLine(0, i, 32, i);
794 painter.setPen(c.dark(100 + 3 * contrast / 5 ) ); 796 painter.setPen(c.dark(100 + 3 * contrast / 5 ) );
795 painter.drawLine(0, i+1, 32, i+1); 797 painter.drawLine(0, i+1, 32, i+1);
796 }; 798 };
797 painter.end(); 799 painter.end();
798 bgBrush.setColor(c); 800 bgBrush.setColor(c);
799 bgBrush.setPixmap(wallPaper); 801 bgBrush.setPixmap(wallPaper);
800 appPal.setBrush(QColorGroup::Background, bgBrush); 802 appPal.setBrush(QColorGroup::Background, bgBrush);
801 803
802 // lineedits 804 // lineedits
803 c = QColor ( config. readEntry("Base", ( Qt::white). name ( ))); 805 c = /*QColor ( config. readEntry("Base", ( Qt::white). name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Base );
804 QPixmap basePix; 806 QPixmap basePix;
805 basePix.resize(32, 32); 807 basePix.resize(32, 32);
806 basePix.fill(c.rgb()); 808 basePix.fill(c.rgb());
807 painter.begin(&basePix); 809 painter.begin(&basePix);
808 painter.setPen(c.dark(105)); 810 painter.setPen(c.dark(105));
809 for(i=0; i < 32; i+=4){ 811 for(i=0; i < 32; i+=4){
810 painter.drawLine(0, i, 32, i); 812 painter.drawLine(0, i, 32, i);
811 painter.drawLine(0, i+1, 32, i+1); 813 painter.drawLine(0, i+1, 32, i+1);
812 }; 814 };
813 painter.end(); 815 painter.end();
814 baseBrush.setColor(c); 816 baseBrush.setColor(c);
815 baseBrush.setPixmap(basePix); 817 baseBrush.setPixmap(basePix);
816 it.toFirst(); 818 it.toFirst();
817 while ((w=it.current()) != 0 ){ 819 while ((w=it.current()) != 0 ){
818 ++it; 820 ++it;
819 if(w->inherits("QLineEdit")){ 821 if(w->inherits("QLineEdit")){
820 QPalette pal = w->palette(); 822 QPalette pal = w->palette();
821 pal.setBrush(QColorGroup::Base, baseBrush); 823 pal.setBrush(QColorGroup::Base, baseBrush);
822 w->setPalette(pal); 824 w->setPalette(pal);
823 } 825 }
824 else if(w->inherits("QPushButton")){ 826 else if(w->inherits("QPushButton")){
825 applyCustomAttributes((QPushButton *)w); 827 applyCustomAttributes((QPushButton *)w);
826 } 828 }
827 } 829 }
828
829} 830}
830 831
831void LiquidStyle::polish(QWidget *w) 832void LiquidStyle::polish(QWidget *w)
832{ 833{
833 if(w->inherits("QMenuBar")){ 834 if(w->inherits("QMenuBar")){
834 //((QFrame*)w)->setLineWidth(0); 835 //((QFrame*)w)->setLineWidth(0);
835 w->setBackgroundMode(QWidget::PaletteBackground); 836 w->setBackgroundMode(QWidget::PaletteBackground);
836 w->setBackgroundOrigin(QWidget::ParentOrigin); 837 w->setBackgroundOrigin(QWidget::ParentOrigin);
837 return; 838 return;
838 } 839 }
839 if(w->inherits("QToolBar")){ 840 if(w->inherits("QToolBar")){
840 w->installEventFilter(this); 841 w->installEventFilter(this);
841 w->setBackgroundMode(QWidget::PaletteBackground); 842 w->setBackgroundMode(QWidget::PaletteBackground);
842 w->setBackgroundOrigin(QWidget::WidgetOrigin); 843 w->setBackgroundOrigin(QWidget::WidgetOrigin);
843 return; 844 return;
844 } 845 }
845 if(w->inherits("QPopupMenu")) 846 if(w->inherits("QPopupMenu"))
846 w->setBackgroundMode(QWidget::NoBackground); 847 w->setBackgroundMode(QWidget::NoBackground);
847 else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { 848 else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) {
848 w->installEventFilter(menuHandler); 849 w->installEventFilter(menuHandler);
849 } 850 }
850 851
851 if(w->isTopLevel()){ 852 if(w->isTopLevel()){
852 return; 853 return;
853 } 854 }
854 855
855 856
856 if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame )) 857 if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame ))
857 w-> setBackgroundOrigin ( QWidget::ParentOrigin ); 858 w-> setBackgroundOrigin ( QWidget::ParentOrigin );
858 859
859 if(w->inherits("QComboBox") || 860 if(w->inherits("QComboBox") ||
860 w->inherits("QLineEdit") || w->inherits("QRadioButton") || 861 w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
861 w->inherits("QCheckBox") || w->inherits("QScrollBar")) { 862 w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
862 w->installEventFilter(this); 863 w->installEventFilter(this);
863 } 864 }
864 if(w->inherits("QLineEdit")){ 865 if(w->inherits("QLineEdit")){
865 QPalette pal = w->palette(); 866 QPalette pal = w->palette();
866 pal.setBrush(QColorGroup::Base, baseBrush); 867 pal.setBrush(QColorGroup::Base, baseBrush);
867 w->setPalette(pal); 868 w->setPalette(pal);
868 } 869 }
869 if(w->inherits("QPushButton")){ 870 if(w->inherits("QPushButton")){
870 applyCustomAttributes((QPushButton *)w); 871 applyCustomAttributes((QPushButton *)w);
871 w->installEventFilter(this); 872 w->installEventFilter(this);
872 } 873 }
873 if(w->inherits("QButton") || w-> inherits("QComboBox")){ 874 if(w->inherits("QButton") || w-> inherits("QComboBox")){
874 w-> setBackgroundMode ( QWidget::PaletteBackground ); 875 w-> setBackgroundMode ( QWidget::PaletteBackground );
875 } 876 }
876 877
@@ -903,168 +904,168 @@ void LiquidStyle::polish(QWidget *w)
903 w->installEventFilter(this); 904 w->installEventFilter(this);
904 } 905 }
905 if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) { 906 if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) {
906 ((QToolButton*)w)->setAutoRaise (flatTBButtons); 907 ((QToolButton*)w)->setAutoRaise (flatTBButtons);
907 if ( flatTBButtons ) 908 if ( flatTBButtons )
908 w->setBackgroundOrigin(QWidget::ParentOrigin); 909 w->setBackgroundOrigin(QWidget::ParentOrigin);
909 } 910 }
910 if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){ 911 if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){
911 return; 912 return;
912 } 913 }
913 914
914 if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())-> 915 if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())->
915 palette().active().brush(QColorGroup::Background).pixmap()){ 916 palette().active().brush(QColorGroup::Background).pixmap()){
916 qWarning("No parent pixmap for child widget %s", w->className()); 917 qWarning("No parent pixmap for child widget %s", w->className());
917 return; 918 return;
918 } 919 }
919 if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) && 920 if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) &&
920 !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) { 921 !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) {
921 if(w->backgroundMode() == QWidget::PaletteBackground || 922 if(w->backgroundMode() == QWidget::PaletteBackground ||
922 w->backgroundMode() == QWidget::PaletteButton){ 923 w->backgroundMode() == QWidget::PaletteButton){
923 w->setBackgroundMode(QWidget::X11ParentRelative); 924 w->setBackgroundMode(QWidget::X11ParentRelative);
924 } 925 }
925 } 926 }
926 927
927} 928}
928 929
929void LiquidStyle::unPolish(QWidget *w) 930void LiquidStyle::unPolish(QWidget *w)
930{ 931{
931 if(w->inherits("QMenuBar")){ 932 if(w->inherits("QMenuBar")){
932 ((QFrame *)w)->setLineWidth(1); 933 ((QFrame *)w)->setLineWidth(1);
933 w->setBackgroundMode(QWidget::PaletteBackground); 934 w->setBackgroundMode(QWidget::PaletteBackground);
934 return; 935 return;
935 } 936 }
936 937
937 if(w->inherits("QPopupMenu")) 938 if(w->inherits("QPopupMenu"))
938 w->setBackgroundMode(QWidget::PaletteButton); 939 w->setBackgroundMode(QWidget::PaletteButton);
939 else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { 940 else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) {
940 w->removeEventFilter(menuHandler); 941 w->removeEventFilter(menuHandler);
941 } 942 }
942 943
943 if(w->isTopLevel()) 944 if(w->isTopLevel())
944 return; 945 return;
945 946
946 // for viewport children, don't just check for NoBackground.... 947 // for viewport children, don't just check for NoBackground....
947 bool isViewportChild = w->parent() && 948 bool isViewportChild = w->parent() &&
948 ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) || 949 ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
949 (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0)); 950 (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
950 951
951 w->setPalette(QApplication::palette()); 952 w->unsetPalette();
952 if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){ 953 if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){
953 if(w->inherits("QPushButton")) 954 if(w->inherits("QPushButton"))
954 w->setBackgroundMode(QWidget::PaletteButton); 955 w->setBackgroundMode(QWidget::PaletteButton);
955 else 956 else
956 w->setBackgroundMode(QWidget::PaletteBackground); 957 w->setBackgroundMode(QWidget::PaletteBackground);
957 } 958 }
958 959
959 if(isViewportChild) 960 if(isViewportChild)
960 w->setAutoMask(false); 961 w->setAutoMask(false);
961 962
962 if(w->inherits("QPushButton")){ 963 if(w->inherits("QPushButton")){
963 unapplyCustomAttributes((QPushButton *)w); 964 unapplyCustomAttributes((QPushButton *)w);
964 w->removeEventFilter(this); 965 w->removeEventFilter(this);
965 } 966 }
966/* 967/*
967 if(w->inherits("QPushButton") || w-> inherits("QComboBox")){ 968 if(w->inherits("QPushButton") || w-> inherits("QComboBox")){
968 w-> setBackgroundMode ( PaletteBackground ); 969 w-> setBackgroundMode ( PaletteBackground );
969 } 970 }
970*/ 971*/
971 if(w->inherits("QComboBox") || 972 if(w->inherits("QComboBox") ||
972 w->inherits("QLineEdit") || w->inherits("QRadioButton") || 973 w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
973 w->inherits("QCheckBox") || w->inherits("QScrollBar")) { 974 w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
974 w->removeEventFilter(this); 975 w->removeEventFilter(this);
975 } 976 }
976 if(w->inherits("QButton") || w->inherits("QComboBox")){ 977 if(w->inherits("QButton") || w->inherits("QComboBox")){
977 if(w->parent() && w->parent()->inherits("KHTMLPart")){ 978 if(w->parent() && w->parent()->inherits("KHTMLPart")){
978 w->setAutoMask(false); 979 w->setAutoMask(false);
979 } 980 }
980 } 981 }
981 if(w->inherits("QToolBar")){ 982 if(w->inherits("QToolBar")){
982 w->removeEventFilter(this); 983 w->removeEventFilter(this);
983 w->setBackgroundMode(QWidget::PaletteBackground); 984 w->setBackgroundMode(QWidget::PaletteBackground);
984 return; 985 return;
985 } 986 }
986 if(w->inherits("QHeader")){ 987 if(w->inherits("QHeader")){
987 w->setMouseTracking(false); 988 w->setMouseTracking(false);
988 w->removeEventFilter(this); 989 w->removeEventFilter(this);
989 } 990 }
990} 991}
991 992
992void LiquidStyle::polish(QApplication *app) 993void LiquidStyle::polish(QApplication *app)
993{ 994{
994 995
995 QWindowsStyle::polish(app); 996 QWindowsStyle::polish(app);
996 menuAni = app->isEffectEnabled(UI_AnimateMenu); 997 menuAni = app->isEffectEnabled(UI_AnimateMenu);
997 menuFade = app->isEffectEnabled(UI_FadeMenu); 998 menuFade = app->isEffectEnabled(UI_FadeMenu);
998 if(menuAni) 999 if(menuAni)
999 app->setEffectEnabled(UI_AnimateMenu, false); 1000 app->setEffectEnabled(UI_AnimateMenu, false);
1000 if(menuFade) 1001 if(menuFade)
1001 app->setEffectEnabled(UI_FadeMenu, false); 1002 app->setEffectEnabled(UI_FadeMenu, false);
1002 1003
1003 qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem); 1004 qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem);
1004 1005
1005 Config config ( "qpe" ); 1006 Config config ( "qpe" );
1006 config. setGroup ( "Liquid-Style" ); 1007 config. setGroup ( "Liquid-Style" );
1007 1008
1008 if ( config. readBoolEntry ( "WinDecoration", true )) 1009 // if ( config. readBoolEntry ( "WinDecoration", true ))
1009 QApplication::qwsSetDecoration ( new LiquidDecoration ( )); 1010 // QApplication::qwsSetDecoration ( new LiquidDecoration ( ));
1010 1011
1011 flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false ); 1012 flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false );
1012} 1013}
1013 1014
1014void LiquidStyle::unPolish(QApplication *app) 1015void LiquidStyle::unPolish(QApplication *app)
1015{ 1016{
1016 QWindowsStyle::unPolish(app); 1017 QWindowsStyle::unPolish(app);
1017 app->setEffectEnabled(UI_AnimateMenu, menuAni); 1018 app->setEffectEnabled(UI_AnimateMenu, menuAni);
1018 app->setEffectEnabled(UI_FadeMenu, menuFade); 1019 app->setEffectEnabled(UI_FadeMenu, menuFade);
1019 1020
1020 qt_set_draw_menu_bar_impl ( 0 ); 1021 qt_set_draw_menu_bar_impl ( 0 );
1021 1022
1022 QApplication::qwsSetDecoration ( new QPEDecoration ( )); 1023// QApplication::qwsSetDecoration ( new QPEDecoration ( ));
1023} 1024}
1024 1025
1025/* 1026/*
1026 * This is a fun method ;-) Here's an overview. KToolBar grabs resize to 1027 * This is a fun method ;-) Here's an overview. KToolBar grabs resize to
1027 * force everything to erase and repaint on resize. This is going away, I'm 1028 * force everything to erase and repaint on resize. This is going away, I'm
1028 * trying to get shaped widgets to work right without masking. QPushButton, 1029 * trying to get shaped widgets to work right without masking. QPushButton,
1029 * QComboBox, and Panel applet handles capture mouse enter and leaves in order 1030 * QComboBox, and Panel applet handles capture mouse enter and leaves in order
1030 * to set the highlightwidget and repaint for mouse hovers. CheckBoxes and 1031 * to set the highlightwidget and repaint for mouse hovers. CheckBoxes and
1031 * RadioButtons need to do this differently. Qt buffers these in pixmaps and 1032 * RadioButtons need to do this differently. Qt buffers these in pixmaps and
1032 * caches them in QPixmapCache, which is bad for doing things like hover 1033 * caches them in QPixmapCache, which is bad for doing things like hover
1033 * because the style methods aren't called in paintEvents if everything 1034 * because the style methods aren't called in paintEvents if everything
1034 * is cached. We use our own Paint event handler instead. Taskbuttons and 1035 * is cached. We use our own Paint event handler instead. Taskbuttons and
1035 * pager buttons draw into a pixmap buffer, so we handle those with palette 1036 * pager buttons draw into a pixmap buffer, so we handle those with palette
1036 * modifications. For QHeader, different header items are actually one widget 1037 * modifications. For QHeader, different header items are actually one widget
1037 * that draws multiple items, so we need to check which ID is hightlighted 1038 * that draws multiple items, so we need to check which ID is hightlighted
1038 * and draw it. Finally, we also check enter and leave events for QLineEdit, 1039 * and draw it. Finally, we also check enter and leave events for QLineEdit,
1039 * since if it's inside a combobox we want to highlight the combobox during 1040 * since if it's inside a combobox we want to highlight the combobox during
1040 * hovering in the edit. 1041 * hovering in the edit.
1041 */ 1042 */
1042bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev) 1043bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
1043{ 1044{
1044 if(obj->inherits("QToolBar")){ 1045 if(obj->inherits("QToolBar")){
1045 if(ev->type() == QEvent::Resize){ 1046 if(ev->type() == QEvent::Resize){
1046 const QObjectList *tbChildList = obj->children(); 1047 const QObjectList *tbChildList = obj->children();
1047 QObjectListIt it(*tbChildList); 1048 QObjectListIt it(*tbChildList);
1048 QObject *child; 1049 QObject *child;
1049 while((child = it.current()) != NULL){ 1050 while((child = it.current()) != NULL){
1050 ++it; 1051 ++it;
1051 if(child->isWidgetType()) 1052 if(child->isWidgetType())
1052 ((QWidget *)child)->repaint(true); 1053 ((QWidget *)child)->repaint(true);
1053 } 1054 }
1054 1055
1055 } 1056 }
1056 } 1057 }
1057 else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){ 1058 else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){
1058 QWidget *btn = (QWidget *)obj; 1059 QWidget *btn = (QWidget *)obj;
1059 if(ev->type() == QEvent::Enter){ 1060 if(ev->type() == QEvent::Enter){
1060 if(btn->isEnabled()){ 1061 if(btn->isEnabled()){
1061 highlightWidget = btn; 1062 highlightWidget = btn;
1062 btn->repaint(false); 1063 btn->repaint(false);
1063 } 1064 }
1064 } 1065 }
1065 else if(ev->type() == QEvent::Leave){ 1066 else if(ev->type() == QEvent::Leave){
1066 if(btn == highlightWidget){ 1067 if(btn == highlightWidget){
1067 highlightWidget = NULL; 1068 highlightWidget = NULL;
1068 btn->repaint(false); 1069 btn->repaint(false);
1069 } 1070 }
1070 } 1071 }
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff
index 7dfd868..90ece90 100644
--- a/noncore/styles/liquid/opie-liquid.diff
+++ b/noncore/styles/liquid/opie-liquid.diff
@@ -1,55 +1,55 @@
1This is a patch to mosfet's liquid 0.7. 1This is a patch to mosfet's liquid 0.7.
2Features: 2Features:
3 - Qt-only 3 - Qt-only
4 - works with Qt/E on QPE/OPIE 4 - works with Qt/E on QPE/OPIE
5 5
6 --- -Mon Jul 15 02:34:13 2002 6 --- -Sat Sep 21 05:31:47 2002
7 +++ liquid.hMon Jul 15 01:51:12 2002 7 +++ liquid.hMon Jul 15 02:52:50 2002
8@@ -2,7 +2,7 @@ 8@@ -2,7 +2,7 @@
9 #define LIQUID_STYLE_H 9 #define LIQUID_STYLE_H
10 10
11 11
12-#include <kstyle.h> 12-#include <kstyle.h>
13+#include <qwindowsstyle.h> 13+#include <qwindowsstyle.h>
14 #include <qpainter.h> 14 #include <qpainter.h>
15 #include <qdrawutil.h> 15 #include <qdrawutil.h>
16 #include <qpalette.h> 16 #include <qpalette.h>
17@@ -20,7 +20,7 @@ 17@@ -20,7 +20,7 @@
18 * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved. 18 * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved.
19 */ 19 */
20 20
21-class KPixmap; 21-class KPixmap;
22+class QPixmap; 22+class QPixmap;
23 23
24 #define BITMAP_ITEMS 41 24 #define BITMAP_ITEMS 41
25 #define LIQUID_MENU_CHANGE 667 25 #define LIQUID_MENU_CHANGE 667
26@@ -50,24 +50,22 @@ 26@@ -50,24 +50,22 @@
27 ~TransMenuHandler(){;} 27 ~TransMenuHandler(){;}
28 void reloadSettings(); 28 void reloadSettings();
29 int transType(){return(type);} 29 int transType(){return(type);}
30- KPixmap *pixmap(WId id){return(pixDict.find(id));} 30- KPixmap *pixmap(WId id){return(pixDict.find(id));}
31+ QPixmap *pixmap(WId id){return(pixDict.find(id));} 31+ QPixmap *pixmap(WId id){return(pixDict.find(id));}
32 const QColor& textColor(){return(fgColor);} 32 const QColor& textColor(){return(fgColor);}
33 const QColor& bgColor(){return(color);} 33 const QColor& bgColor(){return(color);}
34 bool useShadowText(){return(shadowText);} 34 bool useShadowText(){return(shadowText);}
35-protected slots: 35-protected slots:
36- void slotKIPCMessage(int id, int arg); 36- void slotKIPCMessage(int id, int arg);
37 protected: 37 protected:
38 bool eventFilter(QObject *obj, QEvent *ev); 38 bool eventFilter(QObject *obj, QEvent *ev);
39- void stripePixmap(KPixmap &pix, const QColor &color); 39- void stripePixmap(KPixmap &pix, const QColor &color);
40+ void stripePixmap(QPixmap &pix, const QColor &color); 40+ void stripePixmap(QPixmap &pix, const QColor &color);
41 41
42 QColor color, fgColor; 42 QColor color, fgColor;
43 int opacity; 43 int opacity;
44 int type; 44 int type;
45 bool shadowText; 45 bool shadowText;
46- QIntDict<KPixmap>pixDict; 46- QIntDict<KPixmap>pixDict;
47+ QIntDict<QPixmap>pixDict; 47+ QIntDict<QPixmap>pixDict;
48 }; 48 };
49 49
50-class LiquidStyle : public KStyle 50-class LiquidStyle : public KStyle
51+class LiquidStyle : public QWindowsStyle 51+class LiquidStyle : public QWindowsStyle
52 { 52 {
53 friend class TransMenuHandler; 53 friend class TransMenuHandler;
54 public: 54 public:
55@@ -121,33 +119,14 @@ 55@@ -121,33 +119,14 @@
@@ -65,98 +65,98 @@ Features:
65- void drawKMenuBar(QPainter *p, int x, int y, int w, int h, 65- void drawKMenuBar(QPainter *p, int x, int y, int w, int h,
66- const QColorGroup &g, bool macMode, 66- const QColorGroup &g, bool macMode,
67- QBrush *fill=NULL); 67- QBrush *fill=NULL);
68- void drawKToolBarButton(QPainter *p, int x, int y, int w, int h, 68- void drawKToolBarButton(QPainter *p, int x, int y, int w, int h,
69- const QColorGroup &g, bool sunken=false, 69- const QColorGroup &g, bool sunken=false,
70- bool raised = true, bool enabled = true, 70- bool raised = true, bool enabled = true,
71- bool popup = false, 71- bool popup = false,
72- KToolButtonType icontext = Icon, 72- KToolButtonType icontext = Icon,
73- const QString& btext=QString::null, 73- const QString& btext=QString::null,
74- const QPixmap *icon=NULL, 74- const QPixmap *icon=NULL,
75- QFont *font=NULL, QWidget *btn=NULL); 75- QFont *font=NULL, QWidget *btn=NULL);
76- void drawKMenuItem(QPainter *p, int x, int y, int w, int h, 76- void drawKMenuItem(QPainter *p, int x, int y, int w, int h,
77- const QColorGroup &g, bool active, 77- const QColorGroup &g, bool active,
78- QMenuItem *item, QBrush *fill=NULL); 78- QMenuItem *item, QBrush *fill=NULL);
79 +void drawMenuBarItem(QPainter *p, int x, int y, int w, int h, 79 +void drawMenuBarItem(QPainter *p, int x, int y, int w, int h,
80+ QMenuItem *mi, QColorGroup &g, bool enabled, bool active ); 80+ QMenuItem *mi, QColorGroup &g, bool enabled, bool active );
81+ 81+
82 void drawPopupMenuItem(QPainter *p, bool checkable, int maxpmw, 82 void drawPopupMenuItem(QPainter *p, bool checkable, int maxpmw,
83 int tab, QMenuItem *mi, const QPalette &pal, 83 int tab, QMenuItem *mi, const QPalette &pal,
84 bool act, bool enabled, int x, int y, int w, 84 bool act, bool enabled, int x, int y, int w,
85 int h); 85 int h);
86 int popupMenuItemHeight(bool c, QMenuItem *mi, const QFontMetrics &fm); 86 int popupMenuItemHeight(bool c, QMenuItem *mi, const QFontMetrics &fm);
87- void drawKProgressBlock(QPainter *p, int x, int y, int w, int h, 87- void drawKProgressBlock(QPainter *p, int x, int y, int w, int h,
88- const QColorGroup &g, QBrush *fill); 88- const QColorGroup &g, QBrush *fill);
89 void drawFocusRect(QPainter *p, const QRect &r, const QColorGroup &g, 89 void drawFocusRect(QPainter *p, const QRect &r, const QColorGroup &g,
90 const QColor *pen, bool atBorder); 90 const QColor *pen, bool atBorder);
91 int defaultFrameWidth() const {return(2);} 91 int defaultFrameWidth() const {return(2);}
92@@ -167,12 +146,6 @@ 92@@ -167,12 +146,6 @@
93 void drawToolButton(QPainter *p, int x, int y, int w, 93 void drawToolButton(QPainter *p, int x, int y, int w,
94 int h, const QColorGroup &g, 94 int h, const QColorGroup &g,
95 bool sunken, const QBrush *fill); 95 bool sunken, const QBrush *fill);
96- void drawKickerAppletHandle(QPainter *p, int x, int y, int w, int h, 96- void drawKickerAppletHandle(QPainter *p, int x, int y, int w, int h,
97- const QColorGroup &g, QBrush *); 97- const QColorGroup &g, QBrush *);
98- void drawKickerTaskButton(QPainter *p, int x, int y, int w, int h, 98- void drawKickerTaskButton(QPainter *p, int x, int y, int w, int h,
99- const QColorGroup &g, 99- const QColorGroup &g,
100- const QString &title, bool active, 100- const QString &title, bool active,
101- QPixmap *icon, QBrush *fill); 101- QPixmap *icon, QBrush *fill);
102 // for repainting toolbuttons when the toolbar is resized 102 // for repainting toolbuttons when the toolbar is resized
103 bool eventFilter(QObject *obj, QEvent *ev); 103 bool eventFilter(QObject *obj, QEvent *ev);
104 void drawSliderGroove(QPainter * p, int x, int y, int w, int h, 104 void drawSliderGroove(QPainter * p, int x, int y, int w, int h,
105@@ -204,6 +177,7 @@ 105@@ -204,6 +177,7 @@
106 QPixmap* getPixmap(BitmapData item); 106 QPixmap* getPixmap(BitmapData item);
107 QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false); 107 QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false);
108 private: 108 private:
109 +bool flatTBButtons; 109 +bool flatTBButtons;
110 bool highcolor; 110 bool highcolor;
111 QColorGroup radioOnGrp; 111 QColorGroup radioOnGrp;
112 QWidget *highlightWidget; 112 QWidget *highlightWidget;
113 --- -Mon Jul 15 02:34:13 2002 113 --- -Sat Sep 21 05:31:48 2002
114 +++ liquid.cppMon Jul 15 02:31:59 2002 114 +++ liquid.cppSat Sep 21 05:18:54 2002
115@@ -10,12 +10,10 @@ 115@@ -10,12 +10,10 @@
116 116
117 #include <qmenudata.h> 117 #include <qmenudata.h>
118 #include "liquid.h" 118 #include "liquid.h"
119-#include <kapp.h> 119-#include <kapp.h>
120-#include <kglobal.h> 120-#include <kglobal.h>
121-#include <kconfig.h> 121-#include <kconfig.h>
122-#include <kdrawutil.h> 122-#include <kdrawutil.h>
123-#include <kglobalsettings.h> 123-#include <kglobalsettings.h>
124-#include <kpixmapeffect.h> 124-#include <kpixmapeffect.h>
125+#include "liquiddeco.h" 125+#include "liquiddeco.h"
126+#include <qapplication.h> 126+#include <qapplication.h>
127+#include <qpe/config.h> 127+#include <qpe/config.h>
128+#include "effects.h" 128+#include "effects.h"
129 #include <qpalette.h> 129 #include <qpalette.h>
130 #include <qbitmap.h> 130 #include <qbitmap.h>
131 #include <qtabbar.h> 131 #include <qtabbar.h>
132@@ -25,28 +23,29 @@ 132@@ -25,28 +23,29 @@
133 #include <qtimer.h> 133 #include <qtimer.h>
134 #include <qpixmapcache.h> 134 #include <qpixmapcache.h>
135 #include <qradiobutton.h> 135 #include <qradiobutton.h>
136-#include <kimageeffect.h> 136-#include <kimageeffect.h>
137-#include <ktoolbar.h> 137-#include <ktoolbar.h>
138+#include <qcombobox.h> 138+#include <qcombobox.h>
139 #include <qdrawutil.h> 139 #include <qdrawutil.h>
140 #include <qwidgetlist.h> 140 #include <qwidgetlist.h>
141 #include <qtoolbutton.h> 141 #include <qtoolbutton.h>
142 #include <qheader.h> 142 #include <qheader.h>
143 #include <unistd.h> 143 #include <unistd.h>
144-#include <klocale.h> 144-#include <klocale.h>
145-#include <kiconloader.h> 145-#include <kiconloader.h>
146-#include <kmenubar.h> 146-#include <kmenubar.h>
147-#include <kipc.h> 147-#include <kipc.h>
148+#include <qmenubar.h> 148+#include <qmenubar.h>
149 149
150-#include <X11/X.h> 150-#include <X11/X.h>
151-#include <X11/Xlib.h> 151-#include <X11/Xlib.h>
152+ 152+
153+#include <stdio.h> 153+#include <stdio.h>
154 154
155 #include "htmlmasks.h" 155 #include "htmlmasks.h"
156 #include "embeddata.h" 156 #include "embeddata.h"
157 157
158-void TransMenuHandler::stripePixmap(KPixmap &pix, const QColor &color) 158-void TransMenuHandler::stripePixmap(KPixmap &pix, const QColor &color)
159+typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *, 159+typedef void (QStyle::*QDrawMenuBarItemImpl) (QPainter *, int, int, int, int, QMenuItem *,
160+ QColorGroup &, bool, bool); 160+ QColorGroup &, bool, bool);
161+ 161+
162+QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl); 162+QDrawMenuBarItemImpl qt_set_draw_menu_bar_impl(QDrawMenuBarItemImpl impl);
@@ -298,554 +298,576 @@ Features:
298- it.toFirst(); 298- it.toFirst();
299- while ((w=it.current()) != 0 ){ 299- while ((w=it.current()) != 0 ){
300- ++it; 300- ++it;
301- if(w->inherits("QMenuBar")){ 301- if(w->inherits("QMenuBar")){
302- w->repaint(); 302- w->repaint();
303- } 303- }
304- } 304- }
305 + wid-> setBackgroundMode( QWidget::PaletteBackground ); 305 + wid-> setBackgroundMode( QWidget::PaletteBackground );
306 } 306 }
307- } 307- }
308- else if(id == MOSFET_BUTTON_CHANGE){ 308- else if(id == MOSFET_BUTTON_CHANGE){
309- qWarning("In mosfet button change"); 309- qWarning("In mosfet button change");
310- // really, this should be in LiquidStyle, but what the hell? ;-) 310- // really, this should be in LiquidStyle, but what the hell? ;-)
311- QWidgetList *list = QApplication::allWidgets(); 311- QWidgetList *list = QApplication::allWidgets();
312- QWidgetListIt it( *list ); 312- QWidgetListIt it( *list );
313- QWidget *w; 313- QWidget *w;
314- while ((w=it.current()) != 0 ){ 314- while ((w=it.current()) != 0 ){
315- ++it; 315- ++it;
316- if(w->inherits("QPushButton")){ 316- if(w->inherits("QPushButton")){
317- ((LiquidStyle*)parent())->unapplyCustomAttributes((QPushButton *)w); 317- ((LiquidStyle*)parent())->unapplyCustomAttributes((QPushButton *)w);
318- } 318- }
319- } 319- }
320- ((LiquidStyle*)parent())->loadCustomButtons(); 320- ((LiquidStyle*)parent())->loadCustomButtons();
321- it.toFirst(); 321- it.toFirst();
322- while ((w=it.current()) != 0 ){ 322- while ((w=it.current()) != 0 ){
323- ++it; 323- ++it;
324- if(w->inherits("QPushButton")){ 324- if(w->inherits("QPushButton")){
325- ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w); 325- ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w);
326 + delete ol; 326 + delete ol;
327 } 327 }
328 } 328 }
329- 329-
330 } 330 }
331+ return(false); 331+ return(false);
332 } 332 }
333 333
334+ 334+
335 LiquidStyle::LiquidStyle() 335 LiquidStyle::LiquidStyle()
336- :KStyle() 336- :KStyle()
337+ :QWindowsStyle() 337+ :QWindowsStyle()
338 { 338 {
339+ setName ( "LiquidStyle" ); 339+ setName ( "LiquidStyle" );
340+ 340+
341 +flatTBButtons = false; 341 +flatTBButtons = false;
342+ 342+
343 btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true); 343 btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
344 btnMaskBmp.setMask(btnMaskBmp); 344 btnMaskBmp.setMask(btnMaskBmp);
345 htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true); 345 htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
346@@ -730,20 +704,26 @@ 346@@ -711,7 +685,6 @@
347
348 void LiquidStyle::polish(QPalette &appPal)
349 {
350-
351 int i;
352 for(i=0; i < BITMAP_ITEMS; ++i){
353 if(pixmaps[i]){
354@@ -730,20 +703,29 @@
347 } 355 }
348 356
349 loadCustomButtons(); 357 loadCustomButtons();
350- lowLightVal = 100 + (2*KGlobalSettings::contrast()+4)*10; 358- lowLightVal = 100 + (2*KGlobalSettings::contrast()+4)*10;
351+ lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10; 359+ lowLightVal = 100 + (2* /*KGlobalSettings::contrast()*/ 3 +4)*10;
352 btnDict.clear(); 360 btnDict.clear();
353 btnBorderDict.clear(); 361 btnBorderDict.clear();
354 bevelFillDict.clear(); 362 bevelFillDict.clear();
355 smallBevelFillDict.clear(); 363 smallBevelFillDict.clear();
356 364
357- KConfig *config = KGlobal::config(); 365- KConfig *config = KGlobal::config();
358- QString oldGrp = config->group(); 366- QString oldGrp = config->group();
367- QPalette pal = QApplication::palette();
359+ Config config ( "qpe" ); 368+ Config config ( "qpe" );
360+ config. setGroup ( "Liquid-Style" ); 369+ config. setGroup ( "Liquid-Style" );
361 +int contrast = config. readNumEntry ( "StippleContrast", 5 ); 370 +int contrast = config. readNumEntry ( "StippleContrast", 5 );
362 +if ( contrast < 0 ) 371 +if ( contrast < 0 )
363 + contrast = 0; 372 + contrast = 0;
364 +else if ( contrast > 10 ) 373 +else if ( contrast > 10 )
365 + contrast = 10; 374 + contrast = 10;
366+ 375+
367 QPalette pal = QApplication::palette(); 376+// QPalette pal = QApplication::palette();
368 377
369 // button color stuff 378 // button color stuff
370- config->setGroup("General"); 379- config->setGroup("General");
371- QColor c = config->readColorEntry("buttonBackground", &Qt::lightGray); 380- QColor c = config->readColorEntry("buttonBackground", &Qt::lightGray);
372- if(c == config->readColorEntry("background", &Qt::lightGray)){ 381- if(c == config->readColorEntry("background", &Qt::lightGray)){
373+ config. setGroup ( "Appearance" ); 382+ config. setGroup ( "Appearance" );
374 + QColor c = QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( ))); 383+ QColor c = // QColor ( config. readEntry("Button", ( Qt::lightGray ). name ( )));
375+ if ( c == QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))) { 384+ appPal. color ( QPalette::Active, QColorGroup::Button );
385+ if ( c == appPal. color ( QPalette::Active, QColorGroup::Background )
386+ //QColor ( config. readEntry ( "background", ( Qt::lightGray ). name ( )))
387+ ) {
376 // force button color to be different from background 388 // force button color to be different from background
377 QBrush btnBrush(QColor(200, 202, 228)); 389 QBrush btnBrush(QColor(200, 202, 228));
378 appPal.setBrush(QColorGroup::Button, btnBrush); 390 appPal.setBrush(QColorGroup::Button, btnBrush);
379@@ -794,15 +774,7 @@ 391@@ -794,15 +776,7 @@
380 pagerBrush.setPixmap(*pix); 392 pagerBrush.setPixmap(*pix);
381 393
382 // background color stuff 394 // background color stuff
383- c = config->readColorEntry("background", &Qt::lightGray); 395- c = config->readColorEntry("background", &Qt::lightGray);
384- if(qstrcmp(kapp->argv()[0], "kicker") == 0){ 396- if(qstrcmp(kapp->argv()[0], "kicker") == 0){
385- appPal.setColor(QColorGroup::Mid, menuBrush.color().dark(110)); 397- appPal.setColor(QColorGroup::Mid, menuBrush.color().dark(110));
386- appPal.setColor(QColorGroup::Dark, menuBrush.color().dark(130)); 398- appPal.setColor(QColorGroup::Dark, menuBrush.color().dark(130));
387- appPal.setColor(QColorGroup::Midlight, menuBrush.color().light(110)); 399- appPal.setColor(QColorGroup::Midlight, menuBrush.color().light(110));
388- appPal.setColor(QColorGroup::Light, menuBrush.color().light(115)); 400- appPal.setColor(QColorGroup::Light, menuBrush.color().light(115));
389- menuBrush.setColor(c); // hack - used for kicker applets 401- menuBrush.setColor(c); // hack - used for kicker applets
390- appPal.setBrush(QColorGroup::Background, menuBrush); 402- appPal.setBrush(QColorGroup::Background, menuBrush);
391- } 403- }
392+ c = QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( ))); 404+ c = /*QColor ( config. readEntry ( "Background", ( Qt::lightGray ).name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Background );
393 c.hsv(&bH, &bS, &bV); 405 c.hsv(&bH, &bS, &bV);
394 c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV); 406 c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV);
395 407
396@@ -817,21 +789,18 @@ 408@@ -817,21 +791,18 @@
397 wallPaper.fill(c.rgb()); 409 wallPaper.fill(c.rgb());
398 painter.begin(&wallPaper); 410 painter.begin(&wallPaper);
399 for(i=0; i < 32; i+=4){ 411 for(i=0; i < 32; i+=4){
400- painter.setPen(c.dark(105)); 412- painter.setPen(c.dark(105));
401+ painter.setPen(c.dark(100 + contrast)); 413+ painter.setPen(c.dark(100 + contrast));
402 painter.drawLine(0, i, 32, i); 414 painter.drawLine(0, i, 32, i);
403- painter.setPen(c.dark(103)); 415- painter.setPen(c.dark(103));
404+ painter.setPen(c.dark(100 + 3 * contrast / 5 ) ); 416+ painter.setPen(c.dark(100 + 3 * contrast / 5 ) );
405 painter.drawLine(0, i+1, 32, i+1); 417 painter.drawLine(0, i+1, 32, i+1);
406 }; 418 };
407 painter.end(); 419 painter.end();
408 bgBrush.setColor(c); 420 bgBrush.setColor(c);
409 bgBrush.setPixmap(wallPaper); 421 bgBrush.setPixmap(wallPaper);
410- if(qstrcmp(kapp->argv()[0], "kicker") != 0 && 422- if(qstrcmp(kapp->argv()[0], "kicker") != 0 &&
411- qstrcmp(kapp->argv()[0], "ksplash") != 0){ 423- qstrcmp(kapp->argv()[0], "ksplash") != 0){
412 appPal.setBrush(QColorGroup::Background, bgBrush); 424 appPal.setBrush(QColorGroup::Background, bgBrush);
413- } 425- }
414 426
415 // lineedits 427 // lineedits
416- c = config->readColorEntry("windowBackground", &Qt::white); 428- c = config->readColorEntry("windowBackground", &Qt::white);
417+ c = QColor ( config. readEntry("Base", ( Qt::white). name ( ))); 429+ c = /*QColor ( config. readEntry("Base", ( Qt::white). name ( )));*/ appPal. color ( QPalette::Active, QColorGroup::Base );
418 QPixmap basePix; 430 QPixmap basePix;
419 basePix.resize(32, 32); 431 basePix.resize(32, 32);
420 basePix.fill(c.rgb()); 432 basePix.fill(c.rgb());
421@@ -857,51 +826,39 @@ 433@@ -856,52 +827,39 @@
434 applyCustomAttributes((QPushButton *)w);
422 } 435 }
423 } 436 }
424 437-
425- config->setGroup(oldGrp); 438- config->setGroup(oldGrp);
426 } 439 }
427 440
428 void LiquidStyle::polish(QWidget *w) 441 void LiquidStyle::polish(QWidget *w)
429 { 442 {
430 if(w->inherits("QMenuBar")){ 443 if(w->inherits("QMenuBar")){
431- ((QFrame*)w)->setLineWidth(0); 444- ((QFrame*)w)->setLineWidth(0);
432- w->setBackgroundMode(QWidget::NoBackground); 445- w->setBackgroundMode(QWidget::NoBackground);
433+ //((QFrame*)w)->setLineWidth(0); 446+ //((QFrame*)w)->setLineWidth(0);
434+ w->setBackgroundMode(QWidget::PaletteBackground); 447+ w->setBackgroundMode(QWidget::PaletteBackground);
435+ w->setBackgroundOrigin(QWidget::ParentOrigin); 448+ w->setBackgroundOrigin(QWidget::ParentOrigin);
436+ return; 449+ return;
437+ } 450+ }
438+ if(w->inherits("QToolBar")){ 451+ if(w->inherits("QToolBar")){
439+ w->installEventFilter(this); 452+ w->installEventFilter(this);
440+ w->setBackgroundMode(QWidget::PaletteBackground); 453+ w->setBackgroundMode(QWidget::PaletteBackground);
441+ w->setBackgroundOrigin(QWidget::WidgetOrigin); 454+ w->setBackgroundOrigin(QWidget::WidgetOrigin);
442 return; 455 return;
443 } 456 }
444 if(w->inherits("QPopupMenu")) 457 if(w->inherits("QPopupMenu"))
445 w->setBackgroundMode(QWidget::NoBackground); 458 w->setBackgroundMode(QWidget::NoBackground);
446+ else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { 459+ else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) {
447 + w->installEventFilter(menuHandler); 460 + w->installEventFilter(menuHandler);
448+ } 461+ }
449 462
450 if(w->isTopLevel()){ 463 if(w->isTopLevel()){
451- if(!w->inherits("QPopupMenu") && 464- if(!w->inherits("QPopupMenu") &&
452- qstrcmp(kapp->argv()[0], "kicker") == 0){ 465- qstrcmp(kapp->argv()[0], "kicker") == 0){
453- qWarning("Got panel toplevel %s", w->className()); 466- qWarning("Got panel toplevel %s", w->className());
454- // force extensions and child panels to use proper palette. 467- // force extensions and child panels to use proper palette.
455- if(w->inherits("Panel")){ 468- if(w->inherits("Panel")){
456- qWarning("Setting panel palette"); 469- qWarning("Setting panel palette");
457- w->setPalette(kapp->palette()); 470- w->setPalette(kapp->palette());
458- } 471- }
459- else{ 472- else{
460- // reset palette for everything else 473- // reset palette for everything else
461- QPalette pal = kapp->palette(); 474- QPalette pal = kapp->palette();
462- pal.setBrush(QColorGroup::Background, bgBrush); 475- pal.setBrush(QColorGroup::Background, bgBrush);
463- pal.setColor(QColorGroup::Mid, bgBrush.color().dark(130)); 476- pal.setColor(QColorGroup::Mid, bgBrush.color().dark(130));
464- pal.setColor(QColorGroup::Dark, bgBrush.color().dark(150)); 477- pal.setColor(QColorGroup::Dark, bgBrush.color().dark(150));
465- pal.setColor(QColorGroup::Midlight, bgBrush.color().light(110)); 478- pal.setColor(QColorGroup::Midlight, bgBrush.color().light(110));
466- pal.setColor(QColorGroup::Light, bgBrush.color().light(120)); 479- pal.setColor(QColorGroup::Light, bgBrush.color().light(120));
467- w->setPalette(pal); 480- w->setPalette(pal);
468- } 481- }
469- } 482- }
470 return; 483 return;
471 } 484 }
472- if(qstrcmp(kapp->argv()[0], "kicker") == 0 && 485- if(qstrcmp(kapp->argv()[0], "kicker") == 0 &&
473- w->inherits("KPanelExtension")){ // FIXME - doesn't work 486- w->inherits("KPanelExtension")){ // FIXME - doesn't work
474- w->setPalette(kapp->palette()); 487- w->setPalette(kapp->palette());
475- } 488- }
476+ 489+
477+ 490+
478+ if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame )) 491+ if ( !w-> inherits("QFrame") || (((QFrame*) w)-> frameShape () == QFrame::NoFrame ))
479 + w-> setBackgroundOrigin ( QWidget::ParentOrigin ); 492 + w-> setBackgroundOrigin ( QWidget::ParentOrigin );
480 493
481 if(w->inherits("QComboBox") || 494 if(w->inherits("QComboBox") ||
482 w->inherits("QLineEdit") || w->inherits("QRadioButton") || 495 w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
483- w->inherits("QCheckBox") || w->inherits("QScrollBar") || 496- w->inherits("QCheckBox") || w->inherits("QScrollBar") ||
484- w->isA("AppletHandle") || w->inherits("KMiniPagerButton") || 497- w->isA("AppletHandle") || w->inherits("KMiniPagerButton") ||
485- w->inherits("TaskContainer")){ 498- w->inherits("TaskContainer")){
486+ w->inherits("QCheckBox") || w->inherits("QScrollBar")) { 499+ w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
487 w->installEventFilter(this); 500 w->installEventFilter(this);
488 } 501 }
489 if(w->inherits("QLineEdit")){ 502 if(w->inherits("QLineEdit")){
490@@ -913,6 +870,9 @@ 503@@ -913,6 +871,9 @@
491 applyCustomAttributes((QPushButton *)w); 504 applyCustomAttributes((QPushButton *)w);
492 w->installEventFilter(this); 505 w->installEventFilter(this);
493 } 506 }
494+ if(w->inherits("QButton") || w-> inherits("QComboBox")){ 507+ if(w->inherits("QButton") || w-> inherits("QComboBox")){
495 + w-> setBackgroundMode ( QWidget::PaletteBackground ); 508 + w-> setBackgroundMode ( QWidget::PaletteBackground );
496+ } 509+ }
497 510
498 bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 || 511 bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 ||
499 qstrcmp(w->name(), "qt_clipped_viewport") == 0; 512 qstrcmp(w->name(), "qt_clipped_viewport") == 0;
500@@ -942,11 +902,14 @@ 513@@ -942,11 +903,14 @@
501 w->setMouseTracking(true); 514 w->setMouseTracking(true);
502 w->installEventFilter(this); 515 w->installEventFilter(this);
503 } 516 }
504+ if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) { 517+ if(w-> inherits("QToolButton")&&w->parent()->inherits("QToolBar")) {
505 + ((QToolButton*)w)->setAutoRaise (flatTBButtons); 518 + ((QToolButton*)w)->setAutoRaise (flatTBButtons);
506 + if ( flatTBButtons ) 519 + if ( flatTBButtons )
507 + w->setBackgroundOrigin(QWidget::ParentOrigin); 520 + w->setBackgroundOrigin(QWidget::ParentOrigin);
508+ } 521+ }
509 if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){ 522 if(w->ownPalette() && !w->inherits("QButton") && !w->inherits("QComboBox")){
510 return; 523 return;
511 } 524 }
512- if(w->inherits("PanelButtonBase")) 525- if(w->inherits("PanelButtonBase"))
513- return; 526- return;
514 527
515 if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())-> 528 if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())->
516 palette().active().brush(QColorGroup::Background).pixmap()){ 529 palette().active().brush(QColorGroup::Background).pixmap()){
517@@ -954,17 +917,13 @@ 530@@ -954,17 +918,13 @@
518 return; 531 return;
519 } 532 }
520 if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) && 533 if(!isViewport && !isViewportChild && !w->testWFlags(WType_Popup) &&
521- !w->inherits("KDesktop") && !w->inherits("PasswordDlg")){ 534- !w->inherits("KDesktop") && !w->inherits("PasswordDlg")){
522 + !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) { 535 + !( !w-> inherits("QLineEdit") && w-> parent() && w-> parent()-> isWidgetType ( ) && w-> parent()-> inherits ( "QMultiLineEdit" ))) {
523 if(w->backgroundMode() == QWidget::PaletteBackground || 536 if(w->backgroundMode() == QWidget::PaletteBackground ||
524 w->backgroundMode() == QWidget::PaletteButton){ 537 w->backgroundMode() == QWidget::PaletteButton){
525 w->setBackgroundMode(QWidget::X11ParentRelative); 538 w->setBackgroundMode(QWidget::X11ParentRelative);
526 } 539 }
527 } 540 }
528- if(w->inherits("KToolBar")){ 541- if(w->inherits("KToolBar")){
529- w->installEventFilter(this); 542- w->installEventFilter(this);
530- //w->setBackgroundMode(QWidget::NoBackground); 543- //w->setBackgroundMode(QWidget::NoBackground);
531- return; 544- return;
532- } 545- }
533+ 546+
534 } 547 }
535 548
536 void LiquidStyle::unPolish(QWidget *w) 549 void LiquidStyle::unPolish(QWidget *w)
537@@ -977,6 +936,9 @@ 550@@ -977,6 +937,9 @@
538 551
539 if(w->inherits("QPopupMenu")) 552 if(w->inherits("QPopupMenu"))
540 w->setBackgroundMode(QWidget::PaletteButton); 553 w->setBackgroundMode(QWidget::PaletteButton);
541+ else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) { 554+ else if(w-> testWFlags(Qt::WType_Popup) && !w->inherits("QListBox")) {
542 + w->removeEventFilter(menuHandler); 555 + w->removeEventFilter(menuHandler);
543+ } 556+ }
544 557
545 if(w->isTopLevel()) 558 if(w->isTopLevel())
546 return; 559 return;
547@@ -1001,12 +963,14 @@ 560@@ -986,7 +949,7 @@
561 ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
562 (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
563
564- w->setPalette(QApplication::palette());
565+ w->unsetPalette();
566 if(w->backgroundMode() == QWidget::X11ParentRelative || isViewportChild){
567 if(w->inherits("QPushButton"))
568 w->setBackgroundMode(QWidget::PaletteButton);
569@@ -1001,12 +964,14 @@
548 unapplyCustomAttributes((QPushButton *)w); 570 unapplyCustomAttributes((QPushButton *)w);
549 w->removeEventFilter(this); 571 w->removeEventFilter(this);
550 } 572 }
551- 573-
552+/* 574+/*
553+ if(w->inherits("QPushButton") || w-> inherits("QComboBox")){ 575+ if(w->inherits("QPushButton") || w-> inherits("QComboBox")){
554 + w-> setBackgroundMode ( PaletteBackground ); 576 + w-> setBackgroundMode ( PaletteBackground );
555+ } 577+ }
556+*/ 578+*/
557 if(w->inherits("QComboBox") || 579 if(w->inherits("QComboBox") ||
558 w->inherits("QLineEdit") || w->inherits("QRadioButton") || 580 w->inherits("QLineEdit") || w->inherits("QRadioButton") ||
559- w->inherits("QCheckBox") || w->inherits("QScrollBar") || 581- w->inherits("QCheckBox") || w->inherits("QScrollBar") ||
560- w->isA("AppletHandle") || w->inherits("KMiniPagerButton") || 582- w->isA("AppletHandle") || w->inherits("KMiniPagerButton") ||
561- w->inherits("TaskContainer")){ 583- w->inherits("TaskContainer")){
562+ w->inherits("QCheckBox") || w->inherits("QScrollBar")) { 584+ w->inherits("QCheckBox") || w->inherits("QScrollBar")) {
563 w->removeEventFilter(this); 585 w->removeEventFilter(this);
564 } 586 }
565 if(w->inherits("QButton") || w->inherits("QComboBox")){ 587 if(w->inherits("QButton") || w->inherits("QComboBox")){
566@@ -1014,9 +978,9 @@ 588@@ -1014,9 +979,9 @@
567 w->setAutoMask(false); 589 w->setAutoMask(false);
568 } 590 }
569 } 591 }
570- if(w->inherits("KToolBar")){ 592- if(w->inherits("KToolBar")){
571+ if(w->inherits("QToolBar")){ 593+ if(w->inherits("QToolBar")){
572 w->removeEventFilter(this); 594 w->removeEventFilter(this);
573- //w->setBackgroundMode(QWidget::PaletteBackground); 595- //w->setBackgroundMode(QWidget::PaletteBackground);
574+ w->setBackgroundMode(QWidget::PaletteBackground); 596+ w->setBackgroundMode(QWidget::PaletteBackground);
575 return; 597 return;
576 } 598 }
577 if(w->inherits("QHeader")){ 599 if(w->inherits("QHeader")){
578@@ -1028,20 +992,34 @@ 600@@ -1028,20 +993,34 @@
579 void LiquidStyle::polish(QApplication *app) 601 void LiquidStyle::polish(QApplication *app)
580 { 602 {
581 603
582- KStyle::polish(app); 604- KStyle::polish(app);
583+ QWindowsStyle::polish(app); 605+ QWindowsStyle::polish(app);
584 menuAni = app->isEffectEnabled(UI_AnimateMenu); 606 menuAni = app->isEffectEnabled(UI_AnimateMenu);
585 menuFade = app->isEffectEnabled(UI_FadeMenu); 607 menuFade = app->isEffectEnabled(UI_FadeMenu);
586 if(menuAni) 608 if(menuAni)
587 app->setEffectEnabled(UI_AnimateMenu, false); 609 app->setEffectEnabled(UI_AnimateMenu, false);
588 if(menuFade) 610 if(menuFade)
589 app->setEffectEnabled(UI_FadeMenu, false); 611 app->setEffectEnabled(UI_FadeMenu, false);
590 + 612 +
591+ qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem); 613+ qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &LiquidStyle::drawMenuBarItem);
592+ 614+
593+ Config config ( "qpe" ); 615+ Config config ( "qpe" );
594+ config. setGroup ( "Liquid-Style" ); 616+ config. setGroup ( "Liquid-Style" );
595+ 617+
596 + if ( config. readBoolEntry ( "WinDecoration", true )) 618 +// if ( config. readBoolEntry ( "WinDecoration", true ))
597 + QApplication::qwsSetDecoration ( new LiquidDecoration ( )); 619 +// QApplication::qwsSetDecoration ( new LiquidDecoration ( ));
598 + 620 +
599 +flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false ); 621 +flatTBButtons = config. readBoolEntry ( "FlatToolButtons", false );
600 } 622 }
601 623
602 void LiquidStyle::unPolish(QApplication *app) 624 void LiquidStyle::unPolish(QApplication *app)
603 { 625 {
604- KStyle::unPolish(app); 626- KStyle::unPolish(app);
605+ QWindowsStyle::unPolish(app); 627+ QWindowsStyle::unPolish(app);
606 app->setEffectEnabled(UI_AnimateMenu, menuAni); 628 app->setEffectEnabled(UI_AnimateMenu, menuAni);
607 app->setEffectEnabled(UI_FadeMenu, menuFade); 629 app->setEffectEnabled(UI_FadeMenu, menuFade);
608+ 630+
609+ qt_set_draw_menu_bar_impl ( 0 ); 631+ qt_set_draw_menu_bar_impl ( 0 );
610+ 632+
611+ QApplication::qwsSetDecoration ( new QPEDecoration ( )); 633+// QApplication::qwsSetDecoration ( new QPEDecoration ( ));
612 } 634 }
613 635
614 /* 636 /*
615@@ -1063,7 +1041,7 @@ 637@@ -1063,7 +1042,7 @@
616 */ 638 */
617 bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev) 639 bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
618 { 640 {
619- if(obj->inherits("KToolBar")){ 641- if(obj->inherits("KToolBar")){
620+ if(obj->inherits("QToolBar")){ 642+ if(obj->inherits("QToolBar")){
621 if(ev->type() == QEvent::Resize){ 643 if(ev->type() == QEvent::Resize){
622 const QObjectList *tbChildList = obj->children(); 644 const QObjectList *tbChildList = obj->children();
623 QObjectListIt it(*tbChildList); 645 QObjectListIt it(*tbChildList);
624@@ -1076,35 +1054,7 @@ 646@@ -1076,35 +1055,7 @@
625 647
626 } 648 }
627 } 649 }
628- else if(obj->inherits("KMiniPagerButton")){ 650- else if(obj->inherits("KMiniPagerButton")){
629- QButton *btn = (QButton *)obj; 651- QButton *btn = (QButton *)obj;
630- if(ev->type() == QEvent::Paint){ 652- if(ev->type() == QEvent::Paint){
631- if(!(btn->isOn() || btn->isDown())){ 653- if(!(btn->isOn() || btn->isDown())){
632- QPalette pal = btn->palette(); 654- QPalette pal = btn->palette();
633- pal.setBrush(QColorGroup::Dark, btn == highlightWidget ? 655- pal.setBrush(QColorGroup::Dark, btn == highlightWidget ?
634- pagerHoverBrush : pagerBrush); 656- pagerHoverBrush : pagerBrush);
635- btn->setPalette(pal); 657- btn->setPalette(pal);
636- } 658- }
637- else{ 659- else{
638- QPalette pal = btn->palette(); 660- QPalette pal = btn->palette();
639- pal.setBrush(QColorGroup::Dark, 661- pal.setBrush(QColorGroup::Dark,
640- QApplication::palette().active().brush(QColorGroup::Dark)); 662- QApplication::palette().active().brush(QColorGroup::Dark));
641- btn->setPalette(pal); 663- btn->setPalette(pal);
642- 664-
643- } 665- }
644- } 666- }
645- else if(ev->type() == QEvent::Enter){ 667- else if(ev->type() == QEvent::Enter){
646- highlightWidget = btn; 668- highlightWidget = btn;
647- btn->repaint(false); 669- btn->repaint(false);
648- } 670- }
649- else if(ev->type() == QEvent::Leave){ 671- else if(ev->type() == QEvent::Leave){
650- highlightWidget = NULL; 672- highlightWidget = NULL;
651- btn->repaint(false); 673- btn->repaint(false);
652- } 674- }
653- 675-
654- } 676- }
655- else if(obj->inherits("QPushButton") || obj->inherits("QComboBox") || 677- else if(obj->inherits("QPushButton") || obj->inherits("QComboBox") ||
656- obj->isA("AppletHandle")){ 678- obj->isA("AppletHandle")){
657+ else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){ 679+ else if(obj->inherits("QPushButton") || obj->inherits("QComboBox")){
658 QWidget *btn = (QWidget *)obj; 680 QWidget *btn = (QWidget *)obj;
659 if(ev->type() == QEvent::Enter){ 681 if(ev->type() == QEvent::Enter){
660 if(btn->isEnabled()){ 682 if(btn->isEnabled()){
661@@ -1119,20 +1069,7 @@ 683@@ -1119,20 +1070,7 @@
662 } 684 }
663 } 685 }
664 } 686 }
665- else if(obj->inherits("TaskContainer")){ 687- else if(obj->inherits("TaskContainer")){
666- QButton *btn = (QButton *)obj; 688- QButton *btn = (QButton *)obj;
667- QPalette pal = btn->palette(); 689- QPalette pal = btn->palette();
668- if(ev->type() == QEvent::Enter){ 690- if(ev->type() == QEvent::Enter){
669- pal.setColor(QColorGroup::Background, pal.active().button().light(110)); 691- pal.setColor(QColorGroup::Background, pal.active().button().light(110));
670- btn->setPalette(pal); 692- btn->setPalette(pal);
671- } 693- }
672- else if(ev->type() == QEvent::Leave){ 694- else if(ev->type() == QEvent::Leave){
673- pal.setColor(QColorGroup::Background, 695- pal.setColor(QColorGroup::Background,
674- QApplication::palette().active().background()); 696- QApplication::palette().active().background());
675- btn->setPalette(pal); 697- btn->setPalette(pal);
676- } 698- }
677- } 699- }
678- else if(obj->inherits("QToolButton") && !obj->inherits("KToolBarButton")){ 700- else if(obj->inherits("QToolButton") && !obj->inherits("KToolBarButton")){
679+ else if(obj->inherits("QToolButton")){ 701+ else if(obj->inherits("QToolButton")){
680 QToolButton *btn = (QToolButton *)btn; 702 QToolButton *btn = (QToolButton *)btn;
681 if(!btn->autoRaise()){ 703 if(!btn->autoRaise()){
682 if(btn->isEnabled()){ 704 if(btn->isEnabled()){
683@@ -1340,11 +1277,6 @@ 705@@ -1340,11 +1278,6 @@
684 QColorGroup g = btn->colorGroup(); 706 QColorGroup g = btn->colorGroup();
685 707
686 708
687- QColor testColor; 709- QColor testColor;
688- if(btn->parent() && btn->parent()->isWidgetType()){ 710- if(btn->parent() && btn->parent()->isWidgetType()){
689- testColor = p->backgroundColor(); // remove me 711- testColor = p->backgroundColor(); // remove me
690- } 712- }
691- 713-
692 //int dw = buttonDefaultIndicatorWidth(); 714 //int dw = buttonDefaultIndicatorWidth();
693 if(btn->hasFocus() || btn->isDefault()){ 715 if(btn->hasFocus() || btn->isDefault()){
694 QColor c = btn->hasFocus() ? g.button().light(110) : g.background(); 716 QColor c = btn->hasFocus() ? g.button().light(110) : g.background();
695@@ -1596,7 +1528,7 @@ 717@@ -1596,7 +1529,7 @@
696 if(sbBuffer.size() != sb->size()) 718 if(sbBuffer.size() != sb->size())
697 sbBuffer.resize(sb->size()); 719 sbBuffer.resize(sb->size());
698 } 720 }
699- subB.setRect( subX,subY,buttonDim,buttonDim ); 721- subB.setRect( subX,subY,buttonDim,buttonDim );
700+ subB.setRect( subX,subY,0,0); // buttonDim,buttonDim ); 722+ subB.setRect( subX,subY,0,0); // buttonDim,buttonDim );
701 addB.setRect( addX,addY,buttonDim,buttonDim ); 723 addB.setRect( addX,addY,buttonDim,buttonDim );
702 if(horiz) 724 if(horiz)
703 subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim ); 725 subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim );
704@@ -1624,7 +1556,7 @@ 726@@ -1624,7 +1557,7 @@
705 QPainter painter; 727 QPainter painter;
706 if(!horiz){ 728 if(!horiz){
707 painter.begin(&sbBuffer); 729 painter.begin(&sbBuffer);
708- QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*3))+1); 730- QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*3))+1);
709+ QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*2))+1); 731+ QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*2))+1);
710 if(sliderR.height() >= 8){ 732 if(sliderR.height() >= 8){
711 painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0, 733 painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0,
712 13, 8); 734 13, 8);
713@@ -1690,7 +1622,7 @@ 735@@ -1690,7 +1623,7 @@
714 } 736 }
715 else{ 737 else{
716 painter.begin(&sbBuffer); 738 painter.begin(&sbBuffer);
717- QRect bgR(subB.right()+1, 0, (len-(buttonDim*3))+1, sb->height()); 739- QRect bgR(subB.right()+1, 0, (len-(buttonDim*3))+1, sb->height());
718+ QRect bgR(subB.right()+1, 0, (len-(buttonDim*2))+1, sb->height()); 740+ QRect bgR(subB.right()+1, 0, (len-(buttonDim*2))+1, sb->height());
719 if(sliderR.width() >= 8){ 741 if(sliderR.width() >= 8){
720 painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0, 742 painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0,
721 8, 13); 743 8, 13);
722@@ -1761,10 +1693,10 @@ 744@@ -1761,10 +1694,10 @@
723 addB.width()-8, addB.height()-8, g, !maxed); 745 addB.width()-8, addB.height()-8, g, !maxed);
724 } 746 }
725 if ( controls & SubLine ) { 747 if ( controls & SubLine ) {
726- drawSBButton(p, subB, g, activeControl == SubLine); 748- drawSBButton(p, subB, g, activeControl == SubLine);
727- drawArrow( p, horiz ? LeftArrow : UpArrow, 749- drawArrow( p, horiz ? LeftArrow : UpArrow,
728- false, subB.x()+4, subB.y()+4, 750- false, subB.x()+4, subB.y()+4,
729- subB.width()-8, subB.height()-8, g, !maxed); 751- subB.width()-8, subB.height()-8, g, !maxed);
730+ // drawSBButton(p, subB, g, activeControl == SubLine); 752+ // drawSBButton(p, subB, g, activeControl == SubLine);
731+ // drawArrow( p, horiz ? LeftArrow : UpArrow, 753+ // drawArrow( p, horiz ? LeftArrow : UpArrow,
732+ // false, subB.x()+4, subB.y()+4, 754+ // false, subB.x()+4, subB.y()+4,
733+ // subB.width()-8, subB.height()-8, g, !maxed); 755+ // subB.width()-8, subB.height()-8, g, !maxed);
734 drawSBButton(p, subHC, g, activeControl == SubLine); 756 drawSBButton(p, subHC, g, activeControl == SubLine);
735 drawArrow( p, horiz ? LeftArrow : UpArrow, 757 drawArrow( p, horiz ? LeftArrow : UpArrow,
736 false, subHC.x()+4, subHC.y()+4, 758 false, subHC.x()+4, subHC.y()+4,
737@@ -1865,8 +1797,8 @@ 759@@ -1865,8 +1798,8 @@
738 else 760 else
739 buttonDim = ( length - b*2 )/2 - 1; 761 buttonDim = ( length - b*2 )/2 - 1;
740 762
741- sliderMin = b + buttonDim; 763- sliderMin = b + buttonDim;
742- maxLength = length - b*2 - buttonDim*3; 764- maxLength = length - b*2 - buttonDim*3;
743+ sliderMin = b + 0; // buttonDim; 765+ sliderMin = b + 0; // buttonDim;
744+ maxLength = length - b*2 - buttonDim*2; // 3; 766+ maxLength = length - b*2 - buttonDim*2; // 3;
745 767
746 if ( sb->maxValue() == sb->minValue() ) { 768 if ( sb->maxValue() == sb->minValue() ) {
747 sliderLength = maxLength; 769 sliderLength = maxLength;
748@@ -1914,8 +1846,8 @@ 770@@ -1914,8 +1847,8 @@
749 return(QSize(16, 16)); 771 return(QSize(16, 16));
750 } 772 }
751 773
752-void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w, 774-void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w,
753- int h, const QColorGroup &g, bool on, 775- int h, const QColorGroup &g, bool on,
754+void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/, 776+void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/,
755+ int /*h*/, const QColorGroup &/*g*/, bool on, 777+ int /*h*/, const QColorGroup &/*g*/, bool on,
756 bool down, bool) 778 bool down, bool)
757 { 779 {
758 bool isHover = highlightWidget == p->device(); 780 bool isHover = highlightWidget == p->device();
759@@ -1957,8 +1889,8 @@ 781@@ -1957,8 +1890,8 @@
760 return(QSize(20, 22)); 782 return(QSize(20, 22));
761 } 783 }
762 784
763-void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h, 785-void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h,
764- const QColorGroup &g, int state, bool down, bool) 786- const QColorGroup &g, int state, bool down, bool)
765+void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/, 787+void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/,
766+ const QColorGroup &/*g*/, int state, bool /*down*/, bool) 788+ const QColorGroup &/*g*/, int state, bool /*down*/, bool)
767 { 789 {
768 bool isHover = highlightWidget == p->device(); 790 bool isHover = highlightWidget == p->device();
769 bool isMasked = p->device() && p->device()->devType() == QInternal::Widget 791 bool isMasked = p->device() && p->device()->devType() == QInternal::Widget
770@@ -1996,8 +1928,8 @@ 792@@ -1996,8 +1929,8 @@
771 } 793 }
772 } 794 }
773 795
774-void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h, 796-void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h,
775- int state) 797- int state)
776+void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/, 798+void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
777+ int /*state*/) 799+ int /*state*/)
778 { 800 {
779 // needed for some reason by KHtml, even tho it's all filled ;P 801 // needed for some reason by KHtml, even tho it's all filled ;P
780 p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask()); 802 p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask());
781@@ -2005,18 +1937,17 @@ 803@@ -2005,18 +1938,17 @@
782 } 804 }
783 805
784 void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h, 806 void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
785- const QColorGroup &g, Orientation orient, 807- const QColorGroup &g, Orientation orient,
786+ const QColorGroup &/*g*/, Orientation orient, 808+ const QColorGroup &/*g*/, Orientation orient,
787 bool, bool) 809 bool, bool)
788 { 810 {
789 QWidget *parent = (QWidget *)p->device(); 811 QWidget *parent = (QWidget *)p->device();
790 p->setBrushOrigin(parent->pos()); 812 p->setBrushOrigin(parent->pos());
791- p->fillRect(x, y, w, h, 813- p->fillRect(x, y, w, h,
792- QApplication::palette().active().brush(QColorGroup::Background)); 814- QApplication::palette().active().brush(QColorGroup::Background));
793+ parent->erase(x, y, w, h); 815+ parent->erase(x, y, w, h);
794 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) : 816 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) :
795 *getPixmap(VSlider)); 817 *getPixmap(VSlider));
796 } 818 }
797 819
798-void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h, 820-void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h,
799+void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/, 821+void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/,
800 Orientation orient, bool, bool) 822 Orientation orient, bool, bool)
801 { 823 {
802 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : 824 p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() :
803@@ -2065,203 +1996,26 @@ 825@@ -2065,203 +1997,26 @@
804 p->drawLineSegments(a); 826 p->drawLineSegments(a);
805 } 827 }
806 828
807-void LiquidStyle::drawKBarHandle(QPainter *p, int x, int y, int w, int h, 829-void LiquidStyle::drawKBarHandle(QPainter *p, int x, int y, int w, int h,
808- const QColorGroup &g, KToolBarPos, 830- const QColorGroup &g, KToolBarPos,
809- QBrush *) 831- QBrush *)
810-{ 832-{
811- p->setPen(g.button().dark(120)); 833- p->setPen(g.button().dark(120));
812- int x2 = x+w-1; 834- int x2 = x+w-1;
813- int y2 = y+h-1; 835- int y2 = y+h-1;
814- p->drawLine(x+1, y, x2-1, y); 836- p->drawLine(x+1, y, x2-1, y);
815- p->drawLine(x+1, y2, x2-1, y2); 837- p->drawLine(x+1, y2, x2-1, y2);
816- p->drawLine(x, y+1, x, y2-1); 838- p->drawLine(x, y+1, x, y2-1);
817- p->drawLine(x2, y+1, x2, y2-1); 839- p->drawLine(x2, y+1, x2, y2-1);
818- 840-
819- p->setPen(g.background()); 841- p->setPen(g.background());
820- p->drawPoint(x, y); 842- p->drawPoint(x, y);
821- p->drawPoint(x2, y); 843- p->drawPoint(x2, y);
822- p->drawPoint(x, y2); 844- p->drawPoint(x, y2);
823- p->drawPoint(x2, y2); 845- p->drawPoint(x2, y2);
824- 846-
825- 847-
826- 848-
827- // p->drawRect(x, y, w, h); 849- // p->drawRect(x, y, w, h);
828- QPixmap *pix = bevelFillDict.find(g.button().rgb()); 850- QPixmap *pix = bevelFillDict.find(g.button().rgb());
829- if(!pix){ 851- if(!pix){
830- int h, s, v; 852- int h, s, v;
831- g.button().hsv(&h, &s, &v); 853- g.button().hsv(&h, &s, &v);
832- pix = new QPixmap(*bevelFillPix); 854- pix = new QPixmap(*bevelFillPix);
833- adjustHSV(*pix, h, s, v); 855- adjustHSV(*pix, h, s, v);
834- bevelFillDict.insert(g.button().rgb(), pix); 856- bevelFillDict.insert(g.button().rgb(), pix);
835- } 857- }
836- 858-
837- p->drawTiledPixmap(x+1, y+1, w-2, h-2, *pix); 859- p->drawTiledPixmap(x+1, y+1, w-2, h-2, *pix);
838-} 860-}
839- 861-
840-void LiquidStyle::drawKMenuBar(QPainter *p, int x, int y, int w, int h, 862-void LiquidStyle::drawKMenuBar(QPainter *p, int x, int y, int w, int h,
841- const QColorGroup &g, bool mac, QBrush *) 863- const QColorGroup &g, bool mac, QBrush *)
842-{ 864-{
843- if(p->device() && p->device()->devType() == QInternal::Widget && 865- if(p->device() && p->device()->devType() == QInternal::Widget &&
844- ((KMenuBar *)p->device())->isTopLevelMenu()){ 866- ((KMenuBar *)p->device())->isTopLevelMenu()){
845- p->setPen(Qt::black); 867- p->setPen(Qt::black);
846- p->drawRect(x, y, w, h); 868- p->drawRect(x, y, w, h);
847- p->drawTiledPixmap(x+1, y+1, w-2, h-2, *menuPix); 869- p->drawTiledPixmap(x+1, y+1, w-2, h-2, *menuPix);
848- // left 870- // left
849- p->drawLine(x+1, y+1, x+1, y+5); 871- p->drawLine(x+1, y+1, x+1, y+5);
850- p->drawLine(x+2, y+1, x+2, y+3); 872- p->drawLine(x+2, y+1, x+2, y+3);
851- p->drawLine(x+3, y+1, x+3, y+2); 873- p->drawLine(x+3, y+1, x+3, y+2);
@@ -949,222 +971,222 @@ Features:
949- ++dy; 971- ++dy;
950- } 972- }
951- if (font) 973- if (font)
952- p->setFont(*font); 974- p->setFont(*font);
953- if(raised) 975- if(raised)
954- p->setPen(KGlobalSettings::toolBarHighlightColor()); 976- p->setPen(KGlobalSettings::toolBarHighlightColor());
955- p->drawText(x+dx, y+dy, fm.width(btext), fm.lineSpacing(), tf, btext); 977- p->drawText(x+dx, y+dy, fm.width(btext), fm.lineSpacing(), tf, btext);
956- } 978- }
957- } 979- }
958- else if (icontext == IconTextBottom){ 980- else if (icontext == IconTextBottom){
959- if (pixmap){ 981- if (pixmap){
960- dx = (w - pixmap->width()) / 2; 982- dx = (w - pixmap->width()) / 2;
961- dy = (h - fm.lineSpacing() - pixmap->height()) / 2; 983- dy = (h - fm.lineSpacing() - pixmap->height()) / 2;
962- if ( sunken ){ 984- if ( sunken ){
963- ++dx; 985- ++dx;
964- ++dy; 986- ++dy;
965- } 987- }
966- p->drawPixmap( x+dx, y+dy, *pixmap ); 988- p->drawPixmap( x+dx, y+dy, *pixmap );
967- } 989- }
968- if (!btext.isNull()){ 990- if (!btext.isNull()){
969- int tf = AlignBottom|AlignHCenter; 991- int tf = AlignBottom|AlignHCenter;
970- dy= pixmap->height(); 992- dy= pixmap->height();
971- dx = 2; 993- dx = 2;
972- if ( sunken ){ 994- if ( sunken ){
973- ++dx; 995- ++dx;
974- ++dy; 996- ++dy;
975- } 997- }
976- if (font) 998- if (font)
977- p->setFont(*font); 999- p->setFont(*font);
978- if(raised) 1000- if(raised)
979- p->setPen(KGlobalSettings::toolBarHighlightColor()); 1001- p->setPen(KGlobalSettings::toolBarHighlightColor());
980- p->drawText(x, y, w, h-3, tf, btext); 1002- p->drawText(x, y, w, h-3, tf, btext);
981- } 1003- }
982- } 1004- }
983- if (popup){ 1005- if (popup){
984- if (enabled) 1006- if (enabled)
985- qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, 0, 0, 1007- qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, 0, 0,
986- g, true); 1008- g, true);
987- else 1009- else
988- qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, 1010- qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5,
989- 0, 0, g, false); 1011- 0, 0, g, false);
990+ if(active){ 1012+ if(active){
991+ x -= 2; // Bug in Qt/E 1013+ x -= 2; // Bug in Qt/E
992+ y -= 2; 1014+ y -= 2;
993+ w += 2; 1015+ w += 2;
994+ h += 2; 1016+ h += 2;
995 } 1017 }
996-} 1018-}
997-
998 1019
1020-
999-void LiquidStyle::drawKMenuItem(QPainter *p, int x, int y, int w, int h, 1021-void LiquidStyle::drawKMenuItem(QPainter *p, int x, int y, int w, int h,
1000- const QColorGroup &g, bool active, QMenuItem *mi, 1022- const QColorGroup &g, bool active, QMenuItem *mi,
1001- QBrush *) 1023- QBrush *)
1002-{ 1024-{
1003- if ( p->font() == KGlobalSettings::generalFont() ) 1025- if ( p->font() == KGlobalSettings::generalFont() )
1004- p->setFont( KGlobalSettings::menuFont() ); 1026- p->setFont( KGlobalSettings::menuFont() );
1005+ QWidget *parent = (QWidget *)p->device(); 1027+ QWidget *parent = (QWidget *)p->device();
1006+ p->setBrushOrigin(parent->pos()); 1028+ p->setBrushOrigin(parent->pos());
1007+ parent->erase(x, y, w, h); 1029+ parent->erase(x, y, w, h);
1008 1030
1009 if(menuHandler->useShadowText()){ 1031 if(menuHandler->useShadowText()){
1010 QColor shadow; 1032 QColor shadow;
1011 if(p->device() && p->device()->devType() == QInternal::Widget && 1033 if(p->device() && p->device()->devType() == QInternal::Widget &&
1012- ((QWidget *)p->device())->inherits("KMenuBar")){ 1034- ((QWidget *)p->device())->inherits("KMenuBar")){
1013- shadow = ((KMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) : 1035- shadow = ((KMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) :
1014+ ((QWidget *)p->device())->inherits("QMenuBar")){ 1036+ ((QWidget *)p->device())->inherits("QMenuBar")){
1015+ shadow = ((QMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) : 1037+ shadow = ((QMenuBar*)p->device())->isTopLevel() ? g.button().dark(130) :
1016 g.background().dark(130); 1038 g.background().dark(130);
1017 } 1039 }
1018 else 1040 else
1019@@ -2300,8 +2054,8 @@ 1041@@ -2300,8 +2055,8 @@
1020 } 1042 }
1021 1043
1022 void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h, 1044 void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h,
1023- const QColorGroup &g, int lineWidth, 1045- const QColorGroup &g, int lineWidth,
1024- const QBrush * fill) 1046- const QBrush * fill)
1025+ const QColorGroup &g, int /*lineWidth*/, 1047+ const QColorGroup &g, int /*lineWidth*/,
1026+ const QBrush * /*fill*/) 1048+ const QBrush * /*fill*/)
1027 { 1049 {
1028 QColor c; 1050 QColor c;
1029 switch(menuHandler->transType()){ 1051 switch(menuHandler->transType()){
1030@@ -2336,8 +2090,6 @@ 1052@@ -2336,8 +2091,6 @@
1031 1053
1032 maxpmw = QMAX( maxpmw, 20 ); 1054 maxpmw = QMAX( maxpmw, 20 );
1033 1055
1034- if ( p->font() == KGlobalSettings::generalFont() ) 1056- if ( p->font() == KGlobalSettings::generalFont() )
1035- p->setFont( KGlobalSettings::menuFont() ); 1057- p->setFont( KGlobalSettings::menuFont() );
1036 1058
1037 bool dis = !enabled; 1059 bool dis = !enabled;
1038 QColorGroup itemg = dis ? pal.disabled() : pal.active(); 1060 QColorGroup itemg = dis ? pal.disabled() : pal.active();
1039@@ -2363,7 +2115,7 @@ 1061@@ -2363,7 +2116,7 @@
1040 p->fillRect(x, y, w, h, menuBrush); 1062 p->fillRect(x, y, w, h, menuBrush);
1041 } 1063 }
1042 else{ 1064 else{
1043- KPixmap *pix = menuHandler->pixmap(((QWidget*)p->device())->winId()); 1065- KPixmap *pix = menuHandler->pixmap(((QWidget*)p->device())->winId());
1044+ QPixmap *pix = menuHandler->pixmap(((QWidget*)p->device())->winId()); 1066+ QPixmap *pix = menuHandler->pixmap(((QWidget*)p->device())->winId());
1045 if(pix) 1067 if(pix)
1046 p->drawPixmap(x, y, *pix, x, y, w, h); 1068 p->drawPixmap(x, y, *pix, x, y, w, h);
1047 } 1069 }
1048@@ -2508,25 +2260,6 @@ 1070@@ -2508,25 +2261,6 @@
1049 return h; 1071 return h;
1050 } 1072 }
1051 1073
1052-void LiquidStyle::drawKProgressBlock(QPainter *p, int x, int y, int w, int h, 1074-void LiquidStyle::drawKProgressBlock(QPainter *p, int x, int y, int w, int h,
1053- const QColorGroup &g, QBrush *fill) 1075- const QColorGroup &g, QBrush *fill)
1054-{ 1076-{
1055- p->setPen(g.button().dark(130)); 1077- p->setPen(g.button().dark(130));
1056- p->drawRect(x, y, w, h); 1078- p->drawRect(x, y, w, h);
1057- p->setPen(g.button().light(120)); 1079- p->setPen(g.button().light(120));
1058- p->drawRect(x+1, y+1, w-2, h-2); 1080- p->drawRect(x+1, y+1, w-2, h-2);
1059- if(w >= 4 && h >= 4){ 1081- if(w >= 4 && h >= 4){
1060- QPixmap *pix = bevelFillDict.find(g.button().dark(120).rgb()); 1082- QPixmap *pix = bevelFillDict.find(g.button().dark(120).rgb());
1061- if(!pix){ 1083- if(!pix){
1062- int h, s, v; 1084- int h, s, v;
1063- g.button().dark(120).hsv(&h, &s, &v); 1085- g.button().dark(120).hsv(&h, &s, &v);
1064- pix = new QPixmap(*bevelFillPix); 1086- pix = new QPixmap(*bevelFillPix);
1065- adjustHSV(*pix, h, s, v); 1087- adjustHSV(*pix, h, s, v);
1066- bevelFillDict.insert(g.button().dark(120).rgb(), pix); 1088- bevelFillDict.insert(g.button().dark(120).rgb(), pix);
1067- } 1089- }
1068- p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix); 1090- p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix);
1069- } 1091- }
1070-} 1092-}
1071 1093
1072 void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r, 1094 void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r,
1073 const QColorGroup &g, const QColor *c, 1095 const QColorGroup &g, const QColor *c,
1074@@ -2540,25 +2273,25 @@ 1096@@ -2540,25 +2274,25 @@
1075 return; 1097 return;
1076 } 1098 }
1077 else{ 1099 else{
1078- KStyle::drawFocusRect(p, r, g, c, atBorder); 1100- KStyle::drawFocusRect(p, r, g, c, atBorder);
1079+ QWindowsStyle::drawFocusRect(p, r, g, c, atBorder); 1101+ QWindowsStyle::drawFocusRect(p, r, g, c, atBorder);
1080 } 1102 }
1081 } 1103 }
1082 else 1104 else
1083- KStyle::drawFocusRect(p, r, g, c, atBorder); 1105- KStyle::drawFocusRect(p, r, g, c, atBorder);
1084+ QWindowsStyle::drawFocusRect(p, r, g, c, atBorder); 1106+ QWindowsStyle::drawFocusRect(p, r, g, c, atBorder);
1085 1107
1086 } 1108 }
1087 1109
1088 void LiquidStyle::polishPopupMenu(QPopupMenu *mnu) 1110 void LiquidStyle::polishPopupMenu(QPopupMenu *mnu)
1089 { 1111 {
1090 mnu->installEventFilter(menuHandler); 1112 mnu->installEventFilter(menuHandler);
1091- KStyle::polishPopupMenu(mnu); 1113- KStyle::polishPopupMenu(mnu);
1092+ QWindowsStyle::polishPopupMenu(mnu); 1114+ QWindowsStyle::polishPopupMenu(mnu);
1093 } 1115 }
1094 1116
1095 void LiquidStyle::drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab, 1117 void LiquidStyle::drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab,
1096 bool selected) 1118 bool selected)
1097 { 1119 {
1098 if(tabBar->shape() != QTabBar::RoundedAbove){ 1120 if(tabBar->shape() != QTabBar::RoundedAbove){
1099- KStyle::drawTab(p, tabBar, tab, selected); 1121- KStyle::drawTab(p, tabBar, tab, selected);
1100+ QWindowsStyle::drawTab(p, tabBar, tab, selected); 1122+ QWindowsStyle::drawTab(p, tabBar, tab, selected);
1101 return; 1123 return;
1102 } 1124 }
1103 QPixmap tilePix; 1125 QPixmap tilePix;
1104@@ -2671,7 +2404,7 @@ 1126@@ -2671,7 +2405,7 @@
1105 vFrame = 8; // was 10 1127 vFrame = 8; // was 10
1106 } 1128 }
1107 else 1129 else
1108- KStyle::tabbarMetrics(t, hFrame, vFrame, overlap); 1130- KStyle::tabbarMetrics(t, hFrame, vFrame, overlap);
1109+ QWindowsStyle::tabbarMetrics(t, hFrame, vFrame, overlap); 1131+ QWindowsStyle::tabbarMetrics(t, hFrame, vFrame, overlap);
1110 } 1132 }
1111 1133
1112 1134
1113@@ -2699,7 +2432,7 @@ 1135@@ -2699,7 +2433,7 @@
1114 p->drawLine(x+1, y+1, x+1, y2-1); 1136 p->drawLine(x+1, y+1, x+1, y2-1);
1115 } 1137 }
1116 else if(lineWidth != 2 || !sunken) 1138 else if(lineWidth != 2 || !sunken)
1117- KStyle::drawPanel(p, x, y, w, h, g, sunken, lineWidth, fill); 1139- KStyle::drawPanel(p, x, y, w, h, g, sunken, lineWidth, fill);
1118+ QWindowsStyle::drawPanel(p, x, y, w, h, g, sunken, lineWidth, fill); 1140+ QWindowsStyle::drawPanel(p, x, y, w, h, g, sunken, lineWidth, fill);
1119 else{ 1141 else{
1120 QPen oldPen = p->pen(); 1142 QPen oldPen = p->pen();
1121 int x2 = x+w-1; 1143 int x2 = x+w-1;
1122@@ -2726,105 +2459,6 @@ 1144@@ -2726,105 +2460,6 @@
1123 } 1145 }
1124 } 1146 }
1125 1147
1126-void LiquidStyle::drawKickerAppletHandle(QPainter *p, int x, int y, int w, int h, 1148-void LiquidStyle::drawKickerAppletHandle(QPainter *p, int x, int y, int w, int h,
1127- const QColorGroup &g, QBrush *) 1149- const QColorGroup &g, QBrush *)
1128-{ 1150-{
1129- p->fillRect(x, y, w, h, g.brush(QColorGroup::Background)); 1151- p->fillRect(x, y, w, h, g.brush(QColorGroup::Background));
1130- drawClearBevel(p, x, y, w, h, highlightWidget == p->device() ? 1152- drawClearBevel(p, x, y, w, h, highlightWidget == p->device() ?
1131- g.button().light(120) : g.button(), g.button()); 1153- g.button().light(120) : g.button(), g.button());
1132- /* 1154- /*
1133- if(h > w){ 1155- if(h > w){
1134- int y2 = y+h-1; 1156- int y2 = y+h-1;
1135- 1157-
1136- p->setPen(g.light()); 1158- p->setPen(g.light());
1137- 1159-
1138- p->drawLine(x+1, y+2, x+1, y2-2); 1160- p->drawLine(x+1, y+2, x+1, y2-2);
1139- p->drawLine(x+4, y+2, x+4, y2-2); 1161- p->drawLine(x+4, y+2, x+4, y2-2);
1140- 1162-
1141- p->setPen(g.dark()); 1163- p->setPen(g.dark());
1142- p->drawLine(x+2, y+2, x+2, y2-2); 1164- p->drawLine(x+2, y+2, x+2, y2-2);
1143- p->drawLine(x+5, y+2, x+5, y2-2); 1165- p->drawLine(x+5, y+2, x+5, y2-2);
1144- 1166-
1145- } 1167- }
1146- else{ 1168- else{
1147- int x2 = x+w-1; 1169- int x2 = x+w-1;
1148- 1170-
1149- p->setPen(g.light()); 1171- p->setPen(g.light());
1150- 1172-
1151- p->drawLine(x+2, y+1, x2-2, y+1); 1173- p->drawLine(x+2, y+1, x2-2, y+1);
1152- p->drawLine(x+2, y+4, x2-2, y+4); 1174- p->drawLine(x+2, y+4, x2-2, y+4);
1153- 1175-
1154- p->setPen(g.dark()); 1176- p->setPen(g.dark());
1155- p->drawLine(x+2, y+2, x2-2, y+2); 1177- p->drawLine(x+2, y+2, x2-2, y+2);
1156- p->drawLine(x+2, y+5, x2-2, y+5); 1178- p->drawLine(x+2, y+5, x2-2, y+5);
1157- }*/ 1179- }*/
1158- 1180-
1159-} 1181-}
1160- 1182-
1161-void LiquidStyle::drawKickerTaskButton(QPainter *p, int x, int y, int w, int h, 1183-void LiquidStyle::drawKickerTaskButton(QPainter *p, int x, int y, int w, int h,
1162- const QColorGroup &g, 1184- const QColorGroup &g,
1163- const QString &text, bool sunken, 1185- const QString &text, bool sunken,
1164- QPixmap *pixmap, QBrush *) 1186- QPixmap *pixmap, QBrush *)
1165-{ 1187-{
1166- p->fillRect(x, y, w, h, g.brush(QColorGroup::Button)); 1188- p->fillRect(x, y, w, h, g.brush(QColorGroup::Button));
1167- drawClearBevel(p, x, y, w, h, sunken ? g.button() : g.background(), g.button()); 1189- drawClearBevel(p, x, y, w, h, sunken ? g.button() : g.background(), g.button());
1168- p->setPen(g.buttonText()); // Kicker doesn't set this ;-) 1190- p->setPen(g.buttonText()); // Kicker doesn't set this ;-)
1169- 1191-
1170- if(text.isNull() && !pixmap) 1192- if(text.isNull() && !pixmap)
@@ -1180,154 +1202,154 @@ Features:
1180- if ( pixmap && !pixmap->isNull() ) { 1202- if ( pixmap && !pixmap->isNull() ) {
1181- int dx = ( pxWidth - pixmap->width() ) / 2; 1203- int dx = ( pxWidth - pixmap->width() ) / 2;
1182- int dy = ( h - pixmap->height() ) / 2; 1204- int dy = ( h - pixmap->height() ) / 2;
1183- p->drawPixmap( br.x()+dx, dy, *pixmap ); 1205- p->drawPixmap( br.x()+dx, dy, *pixmap );
1184- } 1206- }
1185- 1207-
1186- QString s = text; 1208- QString s = text;
1187- static const QString &modStr = KGlobal::staticQString( 1209- static const QString &modStr = KGlobal::staticQString(
1188- QString::fromUtf8("[") + i18n("modified") + QString::fromUtf8("]")); 1210- QString::fromUtf8("[") + i18n("modified") + QString::fromUtf8("]"));
1189- 1211-
1190- int modStrPos = s.find(modStr); 1212- int modStrPos = s.find(modStr);
1191- 1213-
1192- if (-1 != modStrPos) { 1214- if (-1 != modStrPos) {
1193- 1215-
1194- // +1 because we include a space after the closing brace. 1216- // +1 because we include a space after the closing brace.
1195- s.remove(modStrPos, modStr.length()+1); 1217- s.remove(modStrPos, modStr.length()+1);
1196- 1218-
1197- QPixmap modPixmap = SmallIcon("modified"); 1219- QPixmap modPixmap = SmallIcon("modified");
1198- 1220-
1199- int dx = (pxWidth - modPixmap.width()) / 2; 1221- int dx = (pxWidth - modPixmap.width()) / 2;
1200- int dy = (h - modPixmap.height()) / 2; 1222- int dy = (h - modPixmap.height()) / 2;
1201- 1223-
1202- p->drawPixmap(br.x() + textPos + dx, dy, modPixmap); 1224- p->drawPixmap(br.x() + textPos + dx, dy, modPixmap);
1203- 1225-
1204- textPos += pxWidth; 1226- textPos += pxWidth;
1205- } 1227- }
1206- 1228-
1207- if (!s.isEmpty()){ 1229- if (!s.isEmpty()){
1208- if (p->fontMetrics().width(s) > br.width() - textPos) { 1230- if (p->fontMetrics().width(s) > br.width() - textPos) {
1209- 1231-
1210- int maxLen = br.width() - textPos - p->fontMetrics().width("..."); 1232- int maxLen = br.width() - textPos - p->fontMetrics().width("...");
1211- 1233-
1212- while ((!s.isEmpty()) && (p->fontMetrics().width(s) > maxLen)) 1234- while ((!s.isEmpty()) && (p->fontMetrics().width(s) > maxLen))
1213- s.truncate(s.length() - 1); 1235- s.truncate(s.length() - 1);
1214- 1236-
1215- s.append("..."); 1237- s.append("...");
1216- } 1238- }
1217- 1239-
1218- p->setPen(g.buttonText()); 1240- p->setPen(g.buttonText());
1219- 1241-
1220- p->drawText(br.x()+ textPos, -1, w-textPos, h, 1242- p->drawText(br.x()+ textPos, -1, w-textPos, h,
1221- AlignLeft|AlignVCenter, s); 1243- AlignLeft|AlignVCenter, s);
1222- } 1244- }
1223- 1245-
1224-} 1246-}
1225 1247
1226 void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v) 1248 void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v)
1227 { 1249 {
1228@@ -2998,22 +2632,22 @@ 1250@@ -2998,22 +2633,22 @@
1229 customBtnIconList.clear(); 1251 customBtnIconList.clear();
1230 customBtnLabelList.clear(); 1252 customBtnLabelList.clear();
1231 1253
1232- KConfig *config = KGlobal::config(); 1254- KConfig *config = KGlobal::config();
1233- QString oldGrp = config->group(); 1255- QString oldGrp = config->group();
1234- config->setGroup("MosfetButtons"); 1256- config->setGroup("MosfetButtons");
1235+// KConfig *config = KGlobal::config(); 1257+// KConfig *config = KGlobal::config();
1236+// QString oldGrp = config->group(); 1258+// QString oldGrp = config->group();
1237+// config->setGroup("MosfetButtons"); 1259+// config->setGroup("MosfetButtons");
1238 1260
1239 QStrList iconList, colorList; //temp, we store QPixmaps and QColors 1261 QStrList iconList, colorList; //temp, we store QPixmaps and QColors
1240 iconList.setAutoDelete(true); 1262 iconList.setAutoDelete(true);
1241 colorList.setAutoDelete(true); 1263 colorList.setAutoDelete(true);
1242- config->readListEntry("Labels", customBtnLabelList); 1264- config->readListEntry("Labels", customBtnLabelList);
1243- config->readListEntry("Icons", iconList); 1265- config->readListEntry("Icons", iconList);
1244- config->readListEntry("Colors", colorList); 1266- config->readListEntry("Colors", colorList);
1245+// config->readListEntry("Labels", customBtnLabelList); 1267+// config->readListEntry("Labels", customBtnLabelList);
1246+// config->readListEntry("Icons", iconList); 1268+// config->readListEntry("Icons", iconList);
1247+// config->readListEntry("Colors", colorList); 1269+// config->readListEntry("Colors", colorList);
1248 1270
1249 const char *labelStr = customBtnLabelList.first(); 1271 const char *labelStr = customBtnLabelList.first();
1250 const char *colorStr = colorList.first(); 1272 const char *colorStr = colorList.first();
1251 const char *iconStr = iconList.first(); 1273 const char *iconStr = iconList.first();
1252 1274
1253- KIconLoader *ldr = KGlobal::iconLoader(); 1275- KIconLoader *ldr = KGlobal::iconLoader();
1254+// KIconLoader *ldr = KGlobal::iconLoader(); 1276+// KIconLoader *ldr = KGlobal::iconLoader();
1255 while(labelStr != NULL){ 1277 while(labelStr != NULL){
1256 QColor *c = new QColor; 1278 QColor *c = new QColor;
1257 c->setNamedColor(QString(colorStr)); 1279 c->setNamedColor(QString(colorStr));
1258@@ -3022,7 +2656,7 @@ 1280@@ -3022,7 +2657,7 @@
1259 QString tmpStr(iconStr); 1281 QString tmpStr(iconStr);
1260 if(!tmpStr.isEmpty()){ 1282 if(!tmpStr.isEmpty()){
1261 QPixmap *pixmap = 1283 QPixmap *pixmap =
1262- new QPixmap(ldr->loadIcon(tmpStr, KIcon::Small)); 1284- new QPixmap(ldr->loadIcon(tmpStr, KIcon::Small));
1263+ new QPixmap();//ldr->loadIcon(tmpStr, KIcon::Small)); 1285+ new QPixmap();//ldr->loadIcon(tmpStr, KIcon::Small));
1264 if(pixmap->isNull()){ 1286 if(pixmap->isNull()){
1265 delete pixmap; 1287 delete pixmap;
1266 customBtnIconList.append(NULL); 1288 customBtnIconList.append(NULL);
1267@@ -3037,7 +2671,6 @@ 1289@@ -3037,7 +2672,6 @@
1268 colorStr = colorList.next(); 1290 colorStr = colorList.next();
1269 iconStr = iconList.next(); 1291 iconStr = iconList.next();
1270 } 1292 }
1271- config->setGroup(oldGrp); 1293- config->setGroup(oldGrp);
1272 } 1294 }
1273 1295
1274 void LiquidStyle::applyCustomAttributes(QPushButton *btn) 1296 void LiquidStyle::applyCustomAttributes(QPushButton *btn)
1275@@ -3087,7 +2720,7 @@ 1297@@ -3087,7 +2721,7 @@
1276 } 1298 }
1277 } 1299 }
1278 1300
1279-#include "liquid.moc" 1301-#include "liquid.moc"
1280+// #include "liquid.moc" 1302+// #include "liquid.moc"
1281 1303
1282 1304
1283 1305
1284 --- -Mon Jul 15 02:34:13 2002 1306 --- -Sat Sep 21 05:31:48 2002
1285 +++ plugin.cppFri Jul 12 00:41:40 2002 1307 +++ plugin.cppMon Jul 8 02:42:56 2002
1286@@ -1,29 +1,113 @@ 1308@@ -1,29 +1,113 @@
1287 #include "liquid.h" 1309 #include "liquid.h"
1288-#include <klocale.h> 1310-#include <klocale.h>
1289+#include "liquidset.h" 1311+#include "liquidset.h"
1290+#include "plugin.h" 1312+#include "plugin.h"
1291 1313
1292-extern "C" { 1314-extern "C" {
1293- KStyle* allocate(); 1315- KStyle* allocate();
1294- int minor_version(); 1316- int minor_version();
1295- int major_version(); 1317- int major_version();
1296- const char *description(); 1318- const char *description();
1297+ 1319+
1298+ 1320+
1299+LiquidInterface::LiquidInterface ( ) : ref ( 0 ) 1321+LiquidInterface::LiquidInterface ( ) : ref ( 0 )
1300+{ 1322+{
1301+} 1323+}
1302+ 1324+
1303+LiquidInterface::~LiquidInterface ( ) 1325+LiquidInterface::~LiquidInterface ( )
1304+{ 1326+{
1305+} 1327+}
1306+ 1328+
1307+QStyle *LiquidInterface::create ( ) 1329+QStyle *LiquidInterface::create ( )
1308+{ 1330+{
1309 +return new LiquidStyle ( ); 1331 +return new LiquidStyle ( );
1310+} 1332+}
1311+ 1333+
1312+QString LiquidInterface::name ( ) 1334+QString LiquidInterface::name ( )
1313+{ 1335+{
1314 +return QObject::tr( "Liquid", "name" ); 1336 +return QObject::tr( "Liquid", "name" );
1315 } 1337 }
1316 1338
1317-KStyle* allocate() 1339-KStyle* allocate()
1318+QString LiquidInterface::description ( ) 1340+QString LiquidInterface::description ( )
1319 { 1341 {
1320- return(new LiquidStyle); 1342- return(new LiquidStyle);
1321 +return QObject::tr( "High Performance Liquid style by Mosfet", "description" ); 1343 +return QObject::tr( "High Performance Liquid style by Mosfet", "description" );
1322 } 1344 }
1323 1345
1324-int minor_version() 1346-int minor_version()
1325+QCString LiquidInterface::key ( ) 1347+QCString LiquidInterface::key ( )
1326 { 1348 {
1327- return(0); 1349- return(0);
1328 +return QCString ( "liquid" ); 1350 +return QCString ( "liquid" );
1329 } 1351 }
1330 1352
1331-int major_version() 1353-int major_version()
1332+unsigned int LiquidInterface::version ( ) 1354+unsigned int LiquidInterface::version ( )
1333 { 1355 {