From bc9b7983d6d5fbd0d9920f9f55d416dfcd19edf0894e65abc2689d25fbc4c0da Mon Sep 17 00:00:00 2001 From: Gabriel Lorenzo Date: Thu, 10 Oct 2002 16:36:25 +0000 Subject: [PATCH] estilo KDE --- ediv/ideQT/ideQT.dsp | 45 +- ediv/ideQT/ideQT.opt | Bin 68608 -> 64000 bytes ediv/ideQT/ideQT.plg | 53 +- ediv/ideQT/ideQT.sln | 20 +- ediv/ideQT/ideQT.suo | Bin 9728 -> 9728 bytes ediv/ideQT/ideQT.vcproj | 163 ++- ediv/ideQT/ideqtwindow.cpp | 6 +- ediv/ideQT/kdestyle.cpp | 1483 ++++++++++++++++++++++++++ ediv/ideQT/kdestyle.h | 177 +++ ediv/ideQT/moc_about.cpp | 2 +- ediv/ideQT/moc_ideqtwindow.cpp | 2 +- ediv/ideQT/moc_kdestyle.cpp | 130 +++ ediv/ideQT/moc_nuevo_propiedades.cpp | 2 +- ediv/ideQT/moc_nuevoimpl.cpp | 2 +- ediv/ideQT/moc_proyecto.cpp | 2 +- 15 files changed, 2021 insertions(+), 66 deletions(-) create mode 100644 ediv/ideQT/kdestyle.cpp create mode 100644 ediv/ideQT/kdestyle.h create mode 100644 ediv/ideQT/moc_kdestyle.cpp diff --git a/ediv/ideQT/ideQT.dsp b/ediv/ideQT/ideQT.dsp index e6ace79..1912b39 100644 --- a/ediv/ideQT/ideQT.dsp +++ b/ediv/ideQT/ideQT.dsp @@ -101,6 +101,10 @@ SOURCE=.\ideqtwindow.cpp # End Source File # Begin Source File +SOURCE=.\kdestyle.cpp +# End Source File +# Begin Source File + SOURCE=.\main.cpp # End Source File # Begin Source File @@ -113,6 +117,10 @@ SOURCE=.\moc_ideqtwindow.cpp # End Source File # Begin Source File +SOURCE=.\moc_kdestyle.cpp +# End Source File +# Begin Source File + SOURCE=.\moc_nuevo_propiedades.cpp # End Source File # Begin Source File @@ -207,6 +215,39 @@ InputName=ideqtwindow # End Source File # Begin Source File +SOURCE=.\kdestyle.h + +!IF "$(CFG)" == "ideQT - Win32 Release" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Moc'ing $(InputName).h ... +InputDir=. +InputPath=.\kdestyle.h +InputName=kdestyle + +"$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + %qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp + +# End Custom Build + +!ELSEIF "$(CFG)" == "ideQT - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Moc'ing $(InputName).h ... +InputDir=. +InputPath=.\kdestyle.h +InputName=kdestyle + +"$(InputDir)\moc_$(InputName).cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + %qtdir%\bin\moc.exe $(InputDir)\$(InputName).h -o $(InputDir)\moc_$(InputName).cpp + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\main.h # End Source File # Begin Source File @@ -345,9 +386,5 @@ SOURCE=.\kwrite\kwdoc.h SOURCE=.\kwrite\kwview.h # End Source File # End Group -# Begin Source File - -SOURCE=.\readme.txt -# End Source File # End Target # End Project diff --git a/ediv/ideQT/ideQT.opt b/ediv/ideQT/ideQT.opt index 09c1fdcb3dadf71636e95ea4bc6044ca59d811436a46504b3f7bd8f58efbbfe5..5937016e188cb24b56c09bb880bd688320b732667bc9089c3b983755fab7ddb2 100644 GIT binary patch literal 64000 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 KXbtQi4g4R`k5nrF delta 4210 zcmd^?Yiv|S6vt=w)fTqx7PhTQrFYxXE^R4Lzyx_{+oil)3Mxe!+p@dRZI`>dcklKE zbazW@@QXnIiJ}txWFiHnaAS-?6A~lDK!V@IqClZy!Ux5qe2^gZOz|p-5KS~o40H3F zbLY&tGiM%WXEruwj2$rTE9Hj$v+_+UW9)d{Q9fXZ@fQ&{beQgrkB{SyVg8)8R8>RN z66=UMVm+~ec!3axf{pZEPoT+|V-<>KDr^yoJ-;j3sNffhA!E*bVeu=`PKpkqljtJ4 zi5Q|Ypb zX3T`{+FS<}m|bLI0s}0<6y|1L*2t=;Br}!D0h**nwvtL)S%5}6jXP0MH4kHzcI>HK zgwLzy@&&k6S!*>=D<(p3-twGiw-mRlBow;rkX+MHO2Uu#=^;WKx zEc@^wb2i}Lnk1&|hMB|dFVPP8XLH<9im)Q=M1FV%-U=5X7@mn!;aWVSI+3mxX|JfO zIc`Pra5%CC+3moY?Q5`5F2GdTiAK2^XXSjnCl_iz%B2P@2^AtIofe)ReIMFR6ZVJQp`&5{lz-oTc}{xP%+=mDtdmi}GGcQ+gc+9PQ6V zU%wM)`wwAp{|e3b>YHY*$&#I%KHFf<(nFlWoFd$3Laa))yd;9ej@!q&c@rW-H4_2V zid#c9seBSuSqMF%tPx=>iHxxm2hTh%D`7uz;xQWQ>0TrDhn~b&>No%YAhKt~X|MJY zyNN#H?(w=~e1FsPlPz>+r8CJ`Z%Bhr;^}+9bFW6v-V%tYI5n~ywox0m3NP9c=YQO41ViI z)}=(Q#%8?!-5z9L&Pre;9;V6um=H;q3`Z{ck$EMNeu#T(2I0Iv?2RyBK@H5nN?(zbV+`UZ0E)Vho$gf3PFF5{*bgXS7k_}iJTE}PHZMb z(j~*OYaz}b#m~d1qb-~zcqz(h=w*c1oVsNA

Command Lines

-Creating temporary file "C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP95.bat" with contents -[ -@echo off -%qtdir%\bin\moc.exe .\nuevo_propiedades.h -o .\moc_nuevo_propiedades.cpp -] -Creating command line "C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP95.bat" -Creating command line "rc.exe /l 0xc0a /fo"Debug/res.res" /d "_DEBUG" "D:\ediv\ideQT\res.rc"" -Moc'ing nuevo_propiedades.h ... -Creating temporary file "C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP96.tmp" with contents +Creating temporary file "C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP17C.tmp" with contents [ /nologo /MD /W3 /Gm /GX /ZI /Od /I "d:\Qt\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "QT_DLL" /D "QT_THREAD_SUPPORT" /FR"Debug/" /Fp"Debug/ideQT.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c -"D:\ediv\ideQT\about.cpp" -"D:\ediv\ideQT\ideqtwindow.cpp" -"D:\ediv\ideQT\main.cpp" -"D:\ediv\ideQT\moc_about.cpp" -"D:\ediv\ideQT\moc_ideqtwindow.cpp" -"D:\ediv\ideQT\moc_nuevo_propiedades.cpp" -"D:\ediv\ideQT\moc_nuevoimpl.cpp" -"D:\ediv\ideQT\moc_proyecto.cpp" -"D:\ediv\ideQT\nuevo_propiedades.cpp" -"D:\ediv\ideQT\nuevoimpl.cpp" -"D:\ediv\ideQT\proyecto.cpp" -"D:\ediv\ideQT\kwrite\highlight.cpp" -"D:\ediv\ideQT\kwrite\kwdoc.cpp" +"D:\ediv\ideQT\kdestyle.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP96.tmp" -Creating temporary file "C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP97.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP17C.tmp" +Creating temporary file "C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP17D.tmp" with contents [ kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib wsock32.lib d:\Qt\lib\qt-mt230nc.lib d:\Qt\lib\qtmain.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/edivide.pdb" /debug /machine:I386 /out:"Debug/edivide.exe" /pdbtype:sept .\Debug\about.obj .\Debug\ideqtwindow.obj +.\Debug\kdestyle.obj .\Debug\main.obj .\Debug\moc_about.obj .\Debug\moc_ideqtwindow.obj +.\Debug\moc_kdestyle.obj .\Debug\moc_nuevo_propiedades.obj .\Debug\moc_nuevoimpl.obj .\Debug\moc_proyecto.obj @@ -50,32 +32,21 @@ kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.li .\Debug\kwdoc.obj .\Debug\res.res ] -Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP97.tmp" +Creating command line "link.exe @C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP17D.tmp"

Output Window

-Compiling resources... Compiling... -about.cpp -ideqtwindow.cpp -main.cpp -moc_about.cpp -moc_ideqtwindow.cpp -moc_nuevo_propiedades.cpp -moc_nuevoimpl.cpp -moc_proyecto.cpp -nuevo_propiedades.cpp -nuevoimpl.cpp -proyecto.cpp -highlight.cpp -kwdoc.cpp +kdestyle.cpp Linking... -Creating temporary file "C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP99.tmp" with contents +Creating temporary file "C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP17E.tmp" with contents [ /nologo /o"Debug/ideQT.bsc" .\Debug\about.sbr .\Debug\ideqtwindow.sbr +.\Debug\kdestyle.sbr .\Debug\main.sbr .\Debug\moc_about.sbr .\Debug\moc_ideqtwindow.sbr +.\Debug\moc_kdestyle.sbr .\Debug\moc_nuevo_propiedades.sbr .\Debug\moc_nuevoimpl.sbr .\Debug\moc_proyecto.sbr @@ -84,7 +55,7 @@ Creating temporary file "C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP99.tmp" with cont .\Debug\proyecto.sbr .\Debug\highlight.sbr .\Debug\kwdoc.sbr] -Creating command line "bscmake.exe @C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP99.tmp" +Creating command line "bscmake.exe @C:\DOCUME~1\ADMINI~1\CONFIG~1\Temp\RSP17E.tmp" Creating browse info file...

Output Window

diff --git a/ediv/ideQT/ideQT.sln b/ediv/ideQT/ideQT.sln index c0eaa09..bc48b04 100644 --- a/ediv/ideQT/ideQT.sln +++ b/ediv/ideQT/ideQT.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gif2h", "gif2h\gif2h.vcproj", "{29668928-86D2-4EF1-823D-64BC139B3F24}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gif2h", "gif2h\gif2h.vcproj", "{3B5DEF22-6D9F-4A9D-8E22-891FC9735431}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ideQT", "ideQT.vcproj", "{79BBCF95-8FCC-4490-846B-E39B69E2E9BD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ideQT", "ideQT.vcproj", "{6B5067D3-8030-4746-9855-2A5F70C1F1E7}" EndProject Global GlobalSection(SolutionConfiguration) = preSolution @@ -11,14 +11,14 @@ Global GlobalSection(ProjectDependencies) = postSolution EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution - {29668928-86D2-4EF1-823D-64BC139B3F24}.Debug.ActiveCfg = Debug|Win32 - {29668928-86D2-4EF1-823D-64BC139B3F24}.Debug.Build.0 = Debug|Win32 - {29668928-86D2-4EF1-823D-64BC139B3F24}.Release.ActiveCfg = Release|Win32 - {29668928-86D2-4EF1-823D-64BC139B3F24}.Release.Build.0 = Release|Win32 - {79BBCF95-8FCC-4490-846B-E39B69E2E9BD}.Debug.ActiveCfg = Debug|Win32 - {79BBCF95-8FCC-4490-846B-E39B69E2E9BD}.Debug.Build.0 = Debug|Win32 - {79BBCF95-8FCC-4490-846B-E39B69E2E9BD}.Release.ActiveCfg = Release|Win32 - {79BBCF95-8FCC-4490-846B-E39B69E2E9BD}.Release.Build.0 = Release|Win32 + {3B5DEF22-6D9F-4A9D-8E22-891FC9735431}.Debug.ActiveCfg = Debug|Win32 + {3B5DEF22-6D9F-4A9D-8E22-891FC9735431}.Debug.Build.0 = Debug|Win32 + {3B5DEF22-6D9F-4A9D-8E22-891FC9735431}.Release.ActiveCfg = Release|Win32 + {3B5DEF22-6D9F-4A9D-8E22-891FC9735431}.Release.Build.0 = Release|Win32 + {6B5067D3-8030-4746-9855-2A5F70C1F1E7}.Debug.ActiveCfg = Debug|Win32 + {6B5067D3-8030-4746-9855-2A5F70C1F1E7}.Debug.Build.0 = Debug|Win32 + {6B5067D3-8030-4746-9855-2A5F70C1F1E7}.Release.ActiveCfg = Release|Win32 + {6B5067D3-8030-4746-9855-2A5F70C1F1E7}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/ediv/ideQT/ideQT.suo b/ediv/ideQT/ideQT.suo index 0efddaed964bae8a0f9264db5895d0619a9333912964797a376f678baa39254b..6bbb52fe70b76de81b12d67e4738fce81c4ee036ebc4073c0279cfe6952ddda8 100644 GIT binary patch delta 1108 zcmb_bOKTHR6h4#AOkR^Z6GIY%R8tadHKCKHNg6|F(mYL5NW_JUg5V2;A_X@NwWfc; zoQ+En5!`9>4_rtQrMT%{L2xB5inuad82-F zyL`rO{D?HGFQ}+z5*=*{KA@Zko-j5 zm@Ppm0~MeO)POp084wc%nnHiv-rI4MCFc~3GF_rIHbMcu;|%d5=UZ(O-V*?3_Zdfb zoiaagwRqPP;{#VqvkzmVxT3&up=Y`G<&-+{L2`+u=WQgdzZOLfz867yxC>hv+Mj8Y ziZoAEg>1x6_0xc?h~%&EOMSJLq-9DWw+afG$B0uJRu)#A7O*l4D^81uA4V79Ng!H+ z%uo_*7w}JT-k3YKy^8)Ee=}6~k=%NH!;+*HTPGVH$w2lxFyf^q_#W2#Uq$46m0Eg0 zhzS}pC_OnS-h?y7@OrQ^8LN;kYDt#KiGozFx+{RRd~ B*%$x- delta 1195 zcmb_bO=uHQ5S~qT^WU17GzrzFiKexMmNvguV<`FAq^3zpEkY3yv<9pcEdF7vnt1Ub zcrbIY7qwmlZ_->v4HX1Y#EU0So;<0C9(uBVyCxzEfnwkCy*KmCd-G;y-&FI}{L=-o zqj;TSgmsG18-L2qtC!J`D+nP8wlR z$745LTY)Y#^)IwU2?|n1A`S71bvGbN$6!6fPppM(kPc83-x$^)=3yX;XoHZ#BvXb0 zDi@>>*kRbhl%y2c5Kbg9XRtTSaofnY`ARrr{MDv2{}Ee#(^eLQdtA2XI>?6Ttw5_T zS*7C5eE%znm_yF)SJP5b%s`5$$!DOY)PjV;jjCK2rAR`On}vwNBI9;hJ)cHF2Kl>V zsIpD|=sLw{97!(GmOOU12{GmvFT}U*vW>@tv*J{qap%;`r{~`+h1-40FEkIkHU#2^ zGtPF`u&YF;s7UAO9Gyiw%+Wx)ad&1zr;nq8l z`k~ag?9TC;DNtW`TLk^$udC|%?y^oh``*Mijj3H8I)b||AcjjY&q4O$Z_m>LmH3gl zw`TS51HX?e-W%+(?&Q7x!0H}B!!e(KBoZZZ(eLgXXxDuj`pgw)g5UWkxK diff --git a/ediv/ideQT/ideQT.vcproj b/ediv/ideQT/ideQT.vcproj index 5871a83..72e5619 100644 --- a/ediv/ideQT/ideQT.vcproj +++ b/ediv/ideQT/ideQT.vcproj @@ -22,13 +22,14 @@ Optimization="0" AdditionalIncludeDirectories="$(QTDIR)\include" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,QT_DLL,QT_THREAD_SUPPORT" - BasicRuntimeChecks="0" + BasicRuntimeChecks="3" RuntimeLibrary="2" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Debug/ideQT.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" + BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4" @@ -128,19 +129,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,9 +312,25 @@ RelativePath=".\res.rc"> - - + + + + + + + + + + + + diff --git a/ediv/ideQT/ideqtwindow.cpp b/ediv/ideQT/ideqtwindow.cpp index eb7bf04..2cd658b 100644 --- a/ediv/ideQT/ideqtwindow.cpp +++ b/ediv/ideQT/ideqtwindow.cpp @@ -7,7 +7,8 @@ #include #include #include -#include +//#include +#include "kdestyle.h" #include #include @@ -58,7 +59,8 @@ ideQTWindow::ideQTWindow( QWidget* parent, const char* name, WFlags f ) QPixmap *iconoe=pillagif(ediv_icon); setIcon(*iconoe); - qApp->setStyle( new QPlatinumStyle ); +// qApp->setStyle( new QPlatinumStyle ); + qApp->setStyle( new KDEStyle ); mdi = new QWorkspace( this, "workspace" ); mdi->setBackgroundMode( PaletteDark ); diff --git a/ediv/ideQT/kdestyle.cpp b/ediv/ideQT/kdestyle.cpp new file mode 100644 index 0000000..ec9ce1c --- /dev/null +++ b/ediv/ideQT/kdestyle.cpp @@ -0,0 +1,1483 @@ +/*- + B2Style (C)2000 Daniel M. Duley + Animated menu code based on code by Mario Weilguni + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +#define KStyle QPlatinumStyle + +#ifndef INCLUDE_MENUITEM_DEF +#define INCLUDE_MENUITEM_DEF +#endif + +#ifdef HAVE_LIMITS_H +#include +#endif + +#include +#include +#include "kdestyle.h" +//#include +//#include +//#include +//#include +#include +#include +#include +#include +#include +#include +//#include + +static unsigned char radiooff_light_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xf0, 0x09, 0xf8, 0x0b, 0xfc, 0x17, 0xfc, 0x17, + 0xfc, 0x17, 0xfc, 0x17, 0xfc, 0x17, 0xf8, 0x0b, 0xf0, 0x09, 0x0c, 0x06, + 0xf0, 0x01}; + +static unsigned char radiooff_gray_bits[] = { + 0xf0, 0x01, 0x0c, 0x06, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x00}; + +static unsigned char radiooff_dgray_bits[] = { + 0x00, 0x00, 0xf0, 0x01, 0x0c, 0x02, 0x04, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00}; + +static unsigned char radiomask_bits[] = { + 0xf0, 0x01, 0xfc, 0x07, 0xfe, 0x0b, 0xfe, 0x0b, 0xff, 0x17, 0xff, 0x17, + 0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xfe, 0x0b, 0xf2, 0x09, 0x0c, 0x06, + 0xf0, 0x01}; + +KDEAniMenu::KDEAniMenu(QPopupMenu *menu) + : QObject() +{ + mnu = menu; + widget = NULL; + menu->installEventFilter(this); + connect(mnu, SIGNAL(destroyed()), this, SLOT(slotFinished())); +} + +KDEAniMenu::~KDEAniMenu() +{ + if(widget) + delete widget; +} + +bool KDEAniMenu::eventFilter(QObject *, QEvent *ev) +{ + if(ev->type() == QEvent::Show) + scrollIn(); + else if(ev->type() == QEvent::Hide){ + ; + } + return(false); +} + +void KDEAniMenu::scrollIn() +{ + int w = mnu->width(); + int h = mnu->height(); + + QPixmap bgPix(QPixmap::grabWindow(QApplication::desktop()->winId(), + mnu->x(), mnu->y(), w, h)); + QPixmap mnuPix; + + mnuPix.resize(w, h); + mnuPix.fill(mnu->colorGroup().color(QColorGroup::Background)); + QPainter::redirect(mnu, &mnuPix); + mnu->repaint(false); + QPainter::redirect(mnu, 0); + if(!widget) + widget = new QWidget(0, 0, WStyle_Customize | WStyle_NoBorder | + WStyle_Tool); + widget->move(mnu->x(), mnu->y()); + widget->resize(w, h); + widget->setBackgroundMode(QWidget::NoBackground); + widget->show(); + bitBlt(widget, 0, 0, &bgPix); + int x; + for(x = 0; x <= w-3; x+=2) + bitBlt(widget, x, 0, &mnuPix, x, 0, x+2, h); + QTimer::singleShot(1, this, SLOT(slotDestroyFake())); +} + +void KDEAniMenu::slotDestroyFake() +{ + if(widget) + delete(widget); + widget = NULL; +} + +void KDEAniMenu::slotFinished() +{ + if(widget) + delete(widget); + delete this; +} + + +KDEStyle::KDEStyle() + :QPlatinumStyle() +{ + setButtonDefaultIndicatorWidth(3); + highlightWidget = 0L; +} + +KDEStyle::~KDEStyle() +{ +} + +void KDEStyle::polish(QPalette &pal) +{ +// KConfig *config = KGlobal::config(); +// QString oldGrp = config->group(); +// config->setGroup("KDEStyle"); + + QColor tmpColor(0, 0, 192); +/* if(config->hasKey("RadioOnColor")){ + tmpColor = config->readColorEntry("RadioOnColor", &tmpColor); + radioOnGrp.setColor(QColorGroup::Mid, tmpColor); + radioOnGrp.setColor(QColorGroup::Button, tmpColor); + radioOnGrp.setColor(QColorGroup::Light, tmpColor.light(130)); + radioOnGrp.setColor(QColorGroup::Dark, tmpColor.dark(130)); + } + else{*/ + radioOnGrp.setColor(QColorGroup::Mid, tmpColor); + radioOnGrp.setColor(QColorGroup::Button, tmpColor); + radioOnGrp.setColor(QColorGroup::Light, QColor(0, 0, 255)); + radioOnGrp.setColor(QColorGroup::Dark, QColor(0, 0, 128)); +// } +// config->setGroup("KStyle"); // all kstyle global flags will go here +// if(config->readBoolEntry("inactiveShading", false)){ +/* QColorGroup aGrp = pal.active(); + QColorGroup dGrp = pal.disabled(); + QColorGroup iGrp = aGrp; + + iGrp.setColor(QColorGroup::Mid, aGrp.button()); + iGrp.setColor(QColorGroup::Dark, aGrp.mid()); + dGrp.setColor(QColorGroup::Mid, aGrp.button()); + dGrp.setColor(QColorGroup::Dark, aGrp.mid()); + + pal.setInactive(iGrp); + pal.setDisabled(dGrp);*/ + // } + // config->setGroup(oldGrp);*/ +} + +void KDEStyle::polish(QWidget *w) +{ + if (w->isTopLevel()) + return; + if(w->inherits("QButton") ) { + if(!w->parent() || ( !w->parent()->inherits("KToolBar"))) + w->setBackgroundOrigin(QWidget::ParentOrigin); + } + + // this needs updated draw routine that doesn't depend on being masked + if(w->inherits("QComboBox")) + w->setAutoMask(true); + + if(w->inherits("QPushButton")){ + w->installEventFilter(this); + } +} + +void KDEStyle::unPolish(QWidget *w) +{ + if (w->isTopLevel()) + return; + + if(w->inherits("QButton")){ + if(!w->parent() || (!w->parent()->inherits("KToolBar"))) + w->setBackgroundOrigin(QWidget::WidgetOrigin); + } + + if(w->inherits("QComboBox")) + w->setAutoMask(false); + + if(w->inherits("QPushButton")){ + w->removeEventFilter(this); + } +} + +bool KDEStyle::eventFilter(QObject *obj, QEvent *ev) +{ + if(ev->type() == QEvent::Enter){ + QWidget *btn = (QWidget *)obj; + if (btn->isEnabled()) + { + highlightWidget = btn; + btn->repaint(false); + } + } + else if(ev->type() == QEvent::Leave){ + QWidget *btn = (QWidget *)obj; + if (btn == highlightWidget) + highlightWidget = 0L; + btn->repaint(false); + } + return(false); +} + +void KDEStyle::drawButton(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool sunken, + const QBrush *fill) +{ + QPen oldPen = p->pen(); + int x2 = x+w-1; + int y2 = y+h-1; + p->setPen(g.dark()); + p->drawLine(x+1, y, x2-1, y); + p->drawLine(x, y+1, x, y2-1); + p->drawLine(x+1, y2, x2-1, y2); + p->drawLine(x2, y+1, x2, y2-1); + + if(!sunken){ + p->setPen(g.light()); + p->drawLine(x+2, y+2, x2-1, y+2); + p->drawLine(x+2, y+3, x2-2, y+3); + p->drawLine(x+2, y+4, x+2, y2-1); + p->drawLine(x+3, y+4, x+3, y2-2); + } + else{ + p->setPen(g.mid()); + p->drawLine(x+2, y+2, x2-1, y+2); + p->drawLine(x+2, y+3, x2-2, y+3); + p->drawLine(x+2, y+4, x+2, y2-1); + p->drawLine(x+3, y+4, x+3, y2-2); + } + + + p->setPen(sunken? g.light() : g.mid()); + p->drawLine(x2-1, y+2, x2-1, y2-1); + p->drawLine(x+2, y2-1, x2-1, y2-1); + + p->setPen(g.mid()); + p->drawLine(x+1, y+1, x2-1, y+1); + p->drawLine(x+1, y+2, x+1, y2-1); + p->drawLine(x2-2, y+3, x2-2, y2-2); + + if(fill) + p->fillRect(x+4, y+4, w-6, h-6, *fill); + + p->setPen(oldPen); + +} + +void KDEStyle::drawPushButton(QPushButton *btn, QPainter *p) +{ + QRect r = btn->rect(); + bool sunken = btn->isOn() || btn->isDown(); + QColorGroup g = btn->colorGroup(); + + int x = r.x(); + int y = r.y(); + int w = r.width(); + int h = r.height(); + + if(btn->isDefault()){ + int x2 = r.right(); + int y2 = r.bottom(); + p->setPen(g.dark()); + p->drawLine(x+1, y, x2-1, y); + p->drawLine(x, y+1, x, y2-1); + p->drawLine(x+1, y2, x2-1, y2); + p->drawLine(x2, y+1, x2, y2-1); + } + if(btn->isDefault() || btn->autoDefault()){ + int indiWidth = buttonDefaultIndicatorWidth(); + x+=indiWidth; + y+=indiWidth; + w-=indiWidth*2; + h-=indiWidth*2; + } + drawButton(p, x, y, w, h, g, sunken, (btn == highlightWidget) ? + &g.brush(QColorGroup::Midlight) : + &g.brush(QColorGroup::Button)); + +} + +void KDEStyle::drawPushButtonLabel(QPushButton *btn, QPainter *p) +{ + int x1, y1, x2, y2, w, h; + btn->rect().coords(&x1, &y1, &x2, &y2); + w = btn->width(); + h = btn->height(); + + bool act = btn->isOn() || btn->isDown(); + if(act){ + ++x1, ++y1; + } + + // Draw iconset first, if any + if ( btn->iconSet() && !btn->iconSet()->isNull() ) + { + QIconSet::Mode mode = btn->isEnabled() + ? QIconSet::Normal : QIconSet::Disabled; + if ( mode == QIconSet::Normal && btn->hasFocus() ) + mode = QIconSet::Active; + QPixmap pixmap = btn->iconSet()->pixmap( QIconSet::Small, mode ); + int pixw = pixmap.width(); + int pixh = pixmap.height(); + + p->drawPixmap( x1+6, y1+h/2-pixh/2, pixmap ); + x1 += pixw + 8; + w -= pixw + 8; + } + + if(act || btn->isDefault()){ + QFont font = btn->font(); + font.setBold(true); + p->setFont(font); + drawItem( p, x1 + 1, y1 + 1, w, h, + AlignCenter | ShowPrefix, btn->colorGroup(), btn->isEnabled(), + btn->pixmap(), btn->text(), -1, act ? + &btn->colorGroup().dark() : &btn->colorGroup().mid()); + + drawItem( p, x1, y1, w, h, + AlignCenter | ShowPrefix, btn->colorGroup(), btn->isEnabled(), + btn->pixmap(), btn->text(), -1, act ? + &btn->colorGroup().light() : &btn->colorGroup().buttonText()); + } + else{ + drawItem( p, x1 + ( act ? 1 : 0 ), y1 + ( act ? 1 : 0 ), w, h, + AlignCenter | ShowPrefix, btn->colorGroup(), btn->isEnabled(), + btn->pixmap(), btn->text(), -1, + act ? &btn->colorGroup().light() : &btn->colorGroup().buttonText()); + } +} + +void KDEStyle::drawButtonMask(QPainter *p, int x, int y, int w, int h) +{ + int x2 = x+w-1; + int y2 = y+h-1; + p->fillRect(x, y, w, h, QBrush(color1, SolidPattern)); + p->setPen(color0); + p->drawPoint(x, y); + p->drawPoint(x2, y); + p->drawPoint(x, y2); + p->drawPoint(x2, y2); +} + +void KDEStyle::drawBevelButton(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool sunken, + const QBrush *fill) +{ + // I like black instead of dark() for the darkest shade + int x2 = x+w-1; + int y2 = y+h-1; + p->setPen(sunken ? Qt::black : g.light()); + p->drawLine(x, y, x2, y); + p->drawLine(x, y, x, y2); + p->setPen(sunken ? g.light() : Qt::black); + p->drawLine(x, y2, x2, y2); + p->drawLine(x2, y, x2, y2); + + p->setPen(sunken ? g.dark() : g.midlight()); + p->drawLine(x+1, y+1, x2-1, y+1); + p->drawLine(x+1, y+1, x+1, y2-1); + p->setPen(sunken ? g.midlight() : g.dark()); + p->drawLine(x+1, y2-1, x2-1, y2-1); + p->drawLine(x2-1, y+1, x2-1, y2-1); + p->fillRect(x+2, y+2, w-4, h-4, fill ? *fill : + g.brush(QColorGroup::Button)); + +} + +QRect KDEStyle::buttonRect(int x, int y, int w, int h) +{ + return(QRect(x+4, y+4, w-6, h-6)); +} + +void KDEStyle::drawComboButton(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool sunken, + bool edit, bool, const QBrush *fill) +{ + int x2 = x+w-1; + int y2 = y+h-1; + p->setPen(g.dark()); + p->drawRect(x, y, w, h); + p->fillRect(x+2, y+2, w-4, h-4, fill ? *fill : + g.brush(QColorGroup::Background)); + + p->setPen(sunken? g.light() : g.mid()); + p->drawLine(x2-1, y+2, x2-1, y2-1); + p->drawLine(x+1, y2-1, x2-1, y2-1); + + p->setPen(sunken? g.mid() : g.light()); + p->drawLine(x+1, y+1, x2-1, y+1); + p->drawLine(x+1, y+2, x+1, y2-2); + + p->setPen(g.dark()); + p->drawPoint(x+1, y+1); + + if(edit){ + x2 = x2-17; + y2 = y2-3; + p->setPen(g.dark()); + //p->drawRect(x+2, y+2, x2, y2); + p->drawLine(x+3, y+2, x2, y+2); + p->drawLine(x+2, y+3, x+2, y2); + } + + int arrow_h = h / 3; + int arrow_w = arrow_h; + int arrow_x = w - arrow_w - 6; + int arrow_y = (h - arrow_h) / 2; + drawArrow(p, DownArrow, false, arrow_x, arrow_y, arrow_w, arrow_h, g, true); +} + +void KDEStyle::drawComboButtonMask(QPainter *p, int x, int y, int w, int h) +{ + int x2 = x+w-1; + int y2 = y+h-1; + p->fillRect(x, y, w, h, QBrush(color1, SolidPattern)); + p->setPen(color0); + p->drawPoint(x, y); + p->drawPoint(x, y+1); + p->drawPoint(x+1, y); + p->drawPoint(x2, y); + p->drawPoint(x, y2); + p->drawPoint(x2, y2); +} + +QRect KDEStyle::comboButtonRect(int x, int y, int w, int h) +{ + return(QRect(x+3, y+3, w - (h / 3) - 13, h-6)); +} + +QRect KDEStyle::comboButtonFocusRect(int x, int y, int w, int h) +{ + return(QRect(x+3, y+3, w-(h/3)-13, h-6)); +} + + +void KDEStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb, + int sliderStart, uint controls, + uint activeControl) +{ + int sliderMin, sliderMax, sliderLength, buttonDim; + + scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim ); + + if (sliderStart > sliderMax) + sliderStart = sliderMax; + + bool horiz = sb->orientation() == QScrollBar::Horizontal; + QColorGroup g = sb->colorGroup(); + QRect addB, subB2, subB; + QRect addPageR, subPageR, sliderR; + int addX, addY, subX, subY; + int len = horiz ? sb->width() : sb->height(); + int extent = horiz ? sb->height() : sb->width(); + + if (horiz) { + subY = addY = ( extent - buttonDim ) / 2; + subX = 0; + addX = len - buttonDim; + } + else { + subX = addX = ( extent - buttonDim ) / 2; + subY = 0; + addY = len - buttonDim; + } + subB.setRect( subX,subY,buttonDim,buttonDim ); + addB.setRect( addX,addY,buttonDim,buttonDim ); + if(horiz) + subB2.setRect(addX-buttonDim,addY,buttonDim,buttonDim ); + else + subB2.setRect(addX,addY-buttonDim,buttonDim,buttonDim ); + + int sliderEnd = sliderStart + sliderLength; + int sliderW = extent; + + if (horiz) { + subPageR.setRect( subB.right() + 1, 0, + sliderStart - subB.right() - 1 , sliderW ); + addPageR.setRect( sliderEnd, 0, addX - sliderEnd - buttonDim, sliderW ); + sliderR .setRect( sliderStart, 0, sliderLength, sliderW ); + } + else { + subPageR.setRect( 0, subB.bottom() + 1, sliderW, + sliderStart - subB.bottom() - 1 ); + addPageR.setRect( 0, sliderEnd, sliderW, addY - buttonDim - sliderEnd); + sliderR .setRect( 0, sliderStart, sliderW, sliderLength ); + } + + bool maxed = sb->maxValue() == sb->minValue(); + + if ( controls & AddLine ) { + drawSBButton(p, addB, g, activeControl == AddLine); + drawArrow( p, horiz ? RightArrow : DownArrow, + false, addB.x()+4, addB.y()+4, + addB.width()-8, addB.height()-8, g, !maxed); + } + if ( controls & SubLine ) { + drawSBButton(p, subB, g, activeControl == SubLine); + drawArrow( p, horiz ? LeftArrow : UpArrow, + false, subB.x()+4, subB.y()+4, + subB.width()-8, subB.height()-8, g, !maxed); + drawSBButton(p, subB2, g, activeControl == SubLine); + drawArrow( p, horiz ? LeftArrow : UpArrow, + false, subB2.x()+4, subB2.y()+4, + subB2.width()-8, subB2.height()-8, g, !maxed); + } + if(controls & AddPage){ + if(addPageR.width()){ + p->fillRect(addPageR, activeControl == AddPage ? + g.brush(QColorGroup::Midlight) : + g.brush(QColorGroup::Mid)); + p->setPen(g.dark()); + if(horiz){ + p->drawLine(addPageR.x(), addPageR.y(), addPageR.right(), + addPageR.y()); + p->drawLine(addPageR.x(), addPageR.bottom(), addPageR.right(), + addPageR.bottom()); + p->setPen(activeControl==AddPage ? g.mid() : g.background()); + p->drawLine(addPageR.x(), addPageR.y()+1, addPageR.right(), + addPageR.y()+1); + } + else{ + p->drawLine(addPageR.x(), addPageR.y(), addPageR.x(), + addPageR.bottom()); + p->drawLine(addPageR.right(), addPageR.y(), addPageR.right(), + addPageR.bottom()); + p->setPen(activeControl==AddPage ? g.mid() : g.background()); + p->drawLine(addPageR.x()+1, addPageR.y(), addPageR.x()+1, + addPageR.bottom()); + } + } + } + if(controls & SubPage){ + if(subPageR.height()){ + p->fillRect(subPageR, activeControl == SubPage ? + g.brush(QColorGroup::Midlight) : + g.brush(QColorGroup::Mid)); + p->setPen(g.dark()); + if(horiz){ + p->drawLine(subPageR.x(), subPageR.y(), subPageR.right(), + subPageR.y()); + p->drawLine(subPageR.x(), subPageR.bottom(), subPageR.right(), + subPageR.bottom()); + p->setPen(activeControl==SubPage ? g.mid() : g.background()); + p->drawLine(subPageR.x(), subPageR.y()+1, subPageR.right(), + subPageR.y()+1); + p->drawLine(subPageR.x(), subPageR.y()+1, subPageR.x(), + subPageR.bottom()-1); + } + else{ + p->drawLine(subPageR.x(), subPageR.y(), subPageR.x(), + subPageR.bottom()); + p->drawLine(subPageR.right(), subPageR.y(), subPageR.right(), + subPageR.bottom()); + p->setPen(activeControl==SubPage ? g.mid() : g.background()); + p->drawLine(subPageR.x()+1, subPageR.y(), subPageR.x()+1, + subPageR.bottom()); + p->drawLine(subPageR.x()+1, subPageR.y(), subPageR.right()-1, + subPageR.y()); + } + } + } + if ( controls & Slider ) { + drawSBButton(p, sliderR, g, activeControl == Slider); + g.setColor(QColorGroup::Dark, g.mid()); + drawSBDeco(p, sliderR, g, horiz); + } +} + +void KDEStyle::drawSBButton(QPainter *p, const QRect &r, const QColorGroup &g, + bool down) +{ + p->setPen(g.dark()); + p->drawRect(r); + p->fillRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2, + g.brush(down ? QColorGroup::Midlight : QColorGroup::Button)); + + p->setPen(down ? g.light() : g.mid()); + p->drawLine(r.x()+1, r.bottom()-1, r.right()-1, r.bottom()-1); + p->drawLine(r.right()-1, r.top()+1, r.right()-1, r.bottom()-1); + p->setPen(down ? g.mid() : g.light()); + p->drawLine(r.x()+1, r.y()+1, r.right()-1, r.y()+1); + p->drawLine(r.x()+1, r.y()+1, r.x()+1, r.bottom()-1); +} + +void KDEStyle::drawSBDeco(QPainter *p, const QRect &r, const QColorGroup &g, + bool horiz) +{ + if(horiz){ + if(r.width() >= 15){ + int y = r.y()+3; + int x = r.x() + (r.width()-7)/2; + int y2 = r.bottom()-3; + p->setPen(g.light()); + p->drawLine(x, y, x, y2); + p->drawLine(x+3, y, x+3, y2); + p->drawLine(x+6, y, x+6, y2); + + p->setPen(g.mid()); + p->drawLine(x+1, y, x+1, y2); + p->drawLine(x+4, y, x+4, y2); + p->drawLine(x+7, y, x+7, y2); + } + } + else{ + if(r.height() >= 15){ + int x = r.x()+3; + int y = r.y() + (r.height()-7)/2; + int x2 = r.right()-3; + p->setPen(g.light()); + p->drawLine(x, y, x2, y); + p->drawLine(x, y+3, x2, y+3); + p->drawLine(x, y+6, x2, y+6); + + p->setPen(g.mid()); + p->drawLine(x, y+1, x2, y+1); + p->drawLine(x, y+4, x2, y+4); + p->drawLine(x, y+7, x2, y+7); + } + } +} + + +void KDEStyle::scrollBarMetrics(const QScrollBar *sb, int &sliderMin, + int &sliderMax, int &sliderLength, + int &buttonDim) +{ + + int maxLength; + int b = 0; + bool horiz = sb->orientation() == QScrollBar::Horizontal; + int length = horiz ? sb->width() : sb->height(); + int extent = horiz ? sb->height() : sb->width(); + + if ( length > ( extent - b*2 - 1 )*2 + b*2 ) + buttonDim = extent - b*2; + else + buttonDim = ( length - b*2 )/2 - 1; + + sliderMin = b + buttonDim; + maxLength = length - b*2 - buttonDim*3; + + if ( sb->maxValue() == sb->minValue() ) { + sliderLength = maxLength; + } else { + sliderLength = (sb->pageStep()*maxLength)/ + (sb->maxValue()-sb->minValue()+sb->pageStep()); + uint range = sb->maxValue()-sb->minValue(); + if ( sliderLength < 9 || range > INT_MAX/2 ) + sliderLength = 9; + if ( sliderLength > maxLength ) + sliderLength = maxLength; + } + sliderMax = sliderMin + maxLength - sliderLength; + +} + +QStyle::ScrollControl KDEStyle::scrollBarPointOver(const QScrollBar *sb, + int sliderStart, + const QPoint &p) +{ + if ( !sb->rect().contains( p ) ) + return NoScroll; + int sliderMin, sliderMax, sliderLength, buttonDim, pos; + scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim ); + pos = (sb->orientation() == QScrollBar::Horizontal)? p.x() : p.y(); + if ( pos < sliderMin ) + return SubLine; + if ( pos < sliderStart ) + return SubPage; + if ( pos < sliderStart + sliderLength ) + return Slider; + if ( pos < sliderMax + sliderLength) + return AddPage; + if(pos > sliderMax + sliderLength + 16) + return AddLine; + + return SubLine; +} + +#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) + + +QSize KDEStyle::exclusiveIndicatorSize() const +{ + return(QSize(13,13)); +} + +void KDEStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w, + int h, const QColorGroup &g, bool on, + bool down, bool) +{ + static QBitmap lightBmp(13, 13, radiooff_light_bits, true); + static QBitmap grayBmp(13, 13, radiooff_gray_bits, true); + static QBitmap dgrayBmp(13, 13, radiooff_dgray_bits, true); + + p->fillRect(x, y, w, h, g.brush(QColorGroup::Background)); + kColorBitmaps(p, g, x, y, &lightBmp, &grayBmp, + NULL, &dgrayBmp); + + if(on || down){ + p->setPen(Qt::black); + p->drawLine(5, 4, 7, 4); + p->drawLine(4, 5, 4, 7); + p->drawLine(5, 8, 7, 8); + p->drawLine(8, 5, 8, 7); + p->fillRect(5, 5, 3, 3, Qt::black); + } +} + +void KDEStyle::drawExclusiveIndicatorMask(QPainter *p, int x, int y, int w, + int h, bool) +{ + static QBitmap maskBmp(13, 13, radiomask_bits, true); + p->fillRect(x, y, w, h, Qt::color0); + p->setPen(Qt::color1); + p->drawPixmap(x, y, maskBmp); +} + + +QSize KDEStyle::indicatorSize() const +{ + return(QSize(13, 13)); +} + +void KDEStyle::drawIndicator(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, int state, bool down, bool) +{ + int x2 = x+w-1; + int y2 = y+h-1; + + static unsigned char x_bits[] = {0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63}; + static QBitmap xBmp(7, 7, x_bits, true); + if(!xBmp.mask()) + xBmp.setMask(xBmp); + + + p->setPen(g.mid()); + p->drawLine(x, y, x2, y); + p->drawLine(x, y, x, y2); + + p->setPen(g.light()); + p->drawLine(x2, y+1, x2, y2); + p->drawLine(x+1, y2, x2, y2); + + p->setPen(g.dark()); + p->drawLine(x+1, y+1, x2-1, y+1); + p->drawLine(x+1, y+1, x+1, y2-1); + + p->setPen(g.midlight()); + p->drawLine(x2-1, y+2, x2-1, y2-1); + p->drawLine(x+2, y2-1, x2-1, y2-1); + + p->fillRect(x+2, y+2, w-4, h-4, down ? g.brush(QColorGroup::Background) : + g.brush(QColorGroup::Light)); + + if(state != QButton::Off){ + if(state == QButton::On){ + p->setPen(Qt::black); + p->drawPixmap(3, 3, xBmp); + } + else{ + p->setPen(g.dark()); + p->drawRect(x+2, y+2, w-4, h-4); + p->setPen(Qt::black); + p->drawLine(x+3, (y+h)/2-2, x+w-4, (y+h)/2-2); + p->drawLine(x+3, (y+h)/2, x+w-4, (y+h)/2); + p->drawLine(x+3, (y+h)/2+2, x+w-4, (y+h)/2+2); + } + } + +} + +void KDEStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h, int) +{ + // needed for some reason by KHtml, even tho it's all filled ;P + p->fillRect(x, y, w, h, Qt::color1); +} + +void KDEStyle::drawSlider(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, Orientation orient, + bool, bool) +{ + int x2 = x+w-1; + int y2 = y+h-1; + p->fillRect(x, y, w, h, g.background()); + p->setPen(g.mid()); + p->drawLine(x, y, x2, y); + p->drawLine(x, y, x, y2); + p->setPen(Qt::black); + p->drawLine(x2, y, x2, y2); + p->drawLine(x, y2, x2, y2); + + p->setPen(g.dark()); + p->drawLine(x2-1, y+1, x2-1, y2-1); + p->drawLine(x+1, y2-1, x2-1, y2-1); + p->setPen(g.light()); + p->drawLine(x+1, y+1, x2-1, y+1); + p->drawLine(x+1, y+1, x+1, y2-1); + + p->setPen(g.mid()); + p->drawLine(x2-2, y+2, x2-2, y2-2); + p->drawLine(x+2, y2-2, x2-2, y2-2); + p->setPen(g.midlight()); + p->drawLine(x+2, y+2, x2-2, y+2); + p->drawLine(x+2, y+2, x+2, y2-2); + + if (orient == Horizontal){ + p->setPen(g.light()); + p->drawLine(x+5, y+4, x+5, y2-4); + p->drawLine(x+8, y+4, x+8, y2-4); + p->drawLine(x+11, y+4, x+11, y2-4); + p->setPen(g.dark()); + p->drawLine(x+6, y+4, x+6, y2-4); + p->drawLine(x+9, y+4, x+9, y2-4); + p->drawLine(x+12, y+4, x+12, y2-4); + } + else{ + p->setPen(g.light()); + p->drawLine(x+4, y+5, x2-4, y+5); + p->drawLine(x+4, y+8, x2-4, y+8); + p->drawLine(x+4, y+11, x2-4, y+11); + p->setPen(g.dark()); + p->drawLine(x+4, y+6, x2-4, y+6); + p->drawLine(x+4, y+9, x2-4, y+9); + p->drawLine(x+4, y+12, x2-4, y+12); + } + p->setPen(g.background()); + p->drawPoint(x, y); + p->drawPoint(x2, y); + p->drawPoint(x, y2); + p->drawPoint(x2, y2); +} + +void KDEStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h, + Orientation, bool, bool) +{ + int x2 = x+w-1; + int y2 = y+h-1; + p->fillRect(x, y, w, h, Qt::color1); + p->setPen(Qt::color0); + p->drawPoint(x, y); + p->drawPoint(x2, y); + p->drawPoint(x, y2); + p->drawPoint(x2, y2); +} + +int KDEStyle::sliderLength() const +{ + return(18); +} + +#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) +void KDEStyle::drawArrow(QPainter *p, Qt::ArrowType type, bool on, int x, + int y, int w, int h, const QColorGroup &g, + bool enabled, const QBrush *) +{ + static QCOORD u_arrow[]={3,1, 4,1, 2,2, 5,2, 1,3, 6,3, 0,4, 7,4, 0,5, 7,5}; + static QCOORD d_arrow[]={0,2, 7,2, 0,3, 7,3, 1,4, 6,4, 2,5, 5,5, 3,6, 4,6}; + static QCOORD l_arrow[]={1,3, 1,4, 2,2, 2,5, 3,1, 3,6, 4,0, 4,7, 5,0, 5,7}; + static QCOORD r_arrow[]={2,0, 2,7, 3,0, 3,7, 4,1, 4,6, 5,2, 5,5, 6,3, 6,4}; + + p->setPen(enabled ? on ? g.light() : g.buttonText() : g.mid()); + if(w > 8){ + x = x + (w-8)/2; + y = y + (h-8)/2; + } + + QPointArray a; + switch(type){ + case Qt::UpArrow: + a.setPoints(QCOORDARRLEN(u_arrow), u_arrow); + break; + case Qt::DownArrow: + a.setPoints(QCOORDARRLEN(d_arrow), d_arrow); + break; + case Qt::LeftArrow: + a.setPoints(QCOORDARRLEN(l_arrow), l_arrow); + break; + default: + a.setPoints(QCOORDARRLEN(r_arrow), r_arrow); + break; + } + + a.translate(x, y); + p->drawLineSegments(a); +} + +/*void KDEStyle::drawKBarHandle(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, KToolBarPos, + QBrush *) +{ + if(h > w){ + p->fillRect(x, y, w, h, g.brush(QColorGroup::Background)); + int x2 = x+w-1; + int y2 = y+h-1; + + p->setPen(g.light()); + p->drawLine(x, y, x2, y); + p->drawLine(x, y, x, y2); + + p->drawLine(x+3, y+4, x+3, y2-4); + p->drawLine(x+5, y+4, x+5, y2-4); + p->drawLine(x+7, y+4, x+7, y2-4); + + p->setPen(g.dark()); + p->drawLine(x, y2, x2, y2); + + p->setPen(g.mid()); + p->drawLine(x+4, y+4, x+4, y2-4); + p->drawLine(x+6, y+4, x+6, y2-4); + p->drawLine(x+8, y+4, x+8, y2-4); + + } + else{ + p->fillRect(x, y, w, h, g.brush(QColorGroup::Background)); + int x2 = x+w-1; + int y2 = y+h-1; + + p->setPen(g.light()); + p->drawLine(x, y, x2, y); + p->drawLine(x, y, x, y2); + p->drawLine(x2, y, x2, y2); + + p->drawLine(x+4, y+3, x2-4, y+3); + p->drawLine(x+4, y+5, x2-4, y+5); + p->drawLine(x+4, y+7, x2-4, y+7); + + p->setPen(g.dark()); + p->drawLine(x2, y, x2, y2); + + p->setPen(g.mid()); + p->drawLine(x+4, y+4, x2-4, y+4); + p->drawLine(x+4, y+6, x2-4, y+6); + p->drawLine(x+4, y+8, x2-4, y+8); + + } + +}*/ + +/*void KDEStyle::drawKMenuBar(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool mac, QBrush *) +{ + if(mac){ + p->setPen(g.dark()); + p->drawRect(x, y, w, h); + ++x, ++y, w-=2, h-=2; + int x2 = x+w-1; + int y2 = y+h-1; + p->setPen(g.light()); + p->drawLine(x, y, x2, y); + p->drawLine(x, y, x, y2); + p->setPen(g.mid()); + p->drawLine(x2, y, x2, y2); + p->drawLine(x, y2, x2, y2); + p->fillRect(x+1, y+1, w-2, h-2, g.brush(QColorGroup::Midlight)); + } + else + qDrawShadePanel(p, x, y, w, h, g, false, 1, + &g.brush(QColorGroup::Background)); +}*/ + +/*void KDEStyle::drawKToolBar(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, KToolBarPos, QBrush *) +{ + qDrawShadePanel(p, x, y, w, h, g, false, 1, + &g.brush(QColorGroup::Background)); +}*/ + +/*void KDEStyle::drawKToolBarButton(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool sunken, + bool raised, bool enabled, bool popup, + KToolButtonType icontext, + const QString& btext, const QPixmap *pixmap, + QFont *font, QWidget *) +{ + int dx, dy; + + QFontMetrics fm(*font); + + if(raised || sunken){ + int x2 = x+w; + int y2 = y+h; + + p->fillRect(x, y, w, h, g.brush(QColorGroup::Midlight)); + + p->setPen(g.dark()); + p->drawLine(x+1, y+1, x2-2, y+1); + p->drawLine(x, y+2, x, y2-3); + p->drawLine(x2-1, y+2, x2-1, y2-3); + p->drawLine(x+1, y2-2, x2-2, y2-2); + + p->setPen(sunken ? g.mid() : g.light()); + p->drawLine(x+1, y+2, x2-2, y+2); + p->drawLine(x+1, y+2, x+1, y2-3); + p->setPen(sunken ? g.light() : g.mid()); + p->drawLine(x2-2, y+3, x2-2, y2-3); + p->drawLine(x+2, y2-3, x2-2, y2-3); + } + else + { + p->fillRect(x, y, w, h, g.brush(QColorGroup::Background)); + } + p->setPen(g.buttonText()); + + if (icontext == Icon){ // icon only + if (pixmap){ + dx = ( w - pixmap->width() ) / 2; + dy = ( h - pixmap->height() ) / 2; + if ( sunken ) + { + ++dx; + ++dy; + } + p->drawPixmap( x+dx, y+dy, *pixmap ); + } + } + else if (icontext == IconTextRight){ // icon and text (if any) + if (pixmap){ + dx = 4; + dy = ( h - pixmap->height() ) / 2; + if ( sunken ){ + ++dx; + ++dy; + } + p->drawPixmap( x+dx, y+dy, *pixmap ); + } + if (!btext.isNull()){ + int tf = AlignVCenter|AlignLeft; + if (pixmap) + dx= 4 + pixmap->width() + 2; + else + dx= 4; + dy = 0; + if ( sunken ){ + ++dx; + ++dy; + } + if (font) + p->setFont(*font); + if(raised) + p->setPen(KGlobalSettings::toolBarHighlightColor()); + p->drawText(x+dx, y+dy, w-dx, h, tf, btext); + } + } + else if (icontext == Text){ // only text, even if there is a icon + if (!btext.isNull()){ + int tf = AlignVCenter|AlignLeft; + if (!enabled) + p->setPen(g.dark()); + dx= (w - fm.width(btext)) / 2; + dy= (h - fm.lineSpacing()) / 2; + if ( sunken ){ + ++dx; + ++dy; + } + if (font) + p->setFont(*font); + if(raised) + p->setPen(KGlobalSettings::toolBarHighlightColor()); + p->drawText(x+dx, y+dy, fm.width(btext), fm.lineSpacing(), tf, btext); + } + } + else if (icontext == IconTextBottom){ + if (pixmap){ + dx = (w - pixmap->width()) / 2; + dy = (h - fm.lineSpacing() - pixmap->height()) / 2; + if ( sunken ){ + ++dx; + ++dy; + } + p->drawPixmap( x+dx, y+dy, *pixmap ); + } + if (!btext.isNull()){ + int tf = AlignBottom|AlignHCenter; + dy= pixmap->height(); + dx = 2; + if ( sunken ){ + ++dx; + ++dy; + } + if (font) + p->setFont(*font); + if(raised) + p->setPen(KGlobalSettings::toolBarHighlightColor()); + p->drawText(x, y, w, h-3, tf, btext); + } + } + if (popup){ + if (enabled) + qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, 0, 0, + g, true); + else + qDrawArrow (p, Qt::DownArrow, Qt::WindowsStyle, false, w-5, h-5, + 0, 0, g, false); + } +}*/ + + +/*void KDEStyle::drawKMenuItem(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool active, QMenuItem *mi, + QBrush *) +{ + if ( p->font() == KGlobalSettings::generalFont() ) + p->setFont( KGlobalSettings::menuFont() ); + + if(active){ + qDrawShadePanel(p, x, y, w, h, g, true, 1, + &g.brush(QColorGroup::Midlight)); + QApplication::style().drawItem(p, x, y, w, h, + AlignCenter|ShowPrefix|DontClip|SingleLine, + g, mi->isEnabled(), mi->pixmap(), mi->text(), + -1, &g.buttonText()); + } + else + QApplication::style().drawItem(p, x, y, w, h, + AlignCenter|ShowPrefix|DontClip|SingleLine, + g, mi->isEnabled(), mi->pixmap(), mi->text(), + -1, &g.buttonText() ); +}*/ + +void KDEStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, + int tab, QMenuItem* mi, + const QPalette& pal, bool act, + bool enabled, int x, int y, int w, int h) +{ +static const int motifItemFrame = 2; +static const int motifItemHMargin = 3; +static const int motifItemVMargin = 2; +static const int motifArrowHMargin = 6; +static const int windowsRightBorder = 12; + maxpmw = QMAX( maxpmw, 20 ); + +// if ( p->font() == KGlobalSettings::generalFont() ) +// p->setFont( KGlobalSettings::menuFont() ); + + if(act){ + bool dis = !enabled; + QColorGroup itemg = dis ? pal.disabled() : pal.active(); + + int checkcol = maxpmw; + + qDrawShadePanel(p, x, y, w, h, itemg, true, 1, + dis ? &itemg.brush(QColorGroup::Background): + &itemg.brush(QColorGroup::Midlight)); + + if ( mi->iconSet() ) { + QIconSet::Mode mode = dis? QIconSet::Disabled : QIconSet::Normal; + if (!dis) + mode = QIconSet::Active; + QPixmap pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode); + int pixw = pixmap.width(); + int pixh = pixmap.height(); + QRect cr(x, y, checkcol, h); + QRect pmr(0, 0, pixw, pixh); + pmr.moveCenter( cr.center() ); + p->setPen(itemg.highlightedText()); + p->drawPixmap(pmr.topLeft(), pixmap ); + + } + else if(checkable) { + int mw = checkcol + motifItemFrame; + int mh = h - 2*motifItemFrame; + if (mi->isChecked()){ + drawCheckMark( p, x + motifItemFrame, + y+motifItemFrame, mw, mh, itemg, act, dis ); + } + } + p->setPen(itemg.buttonText()); + QColor discol; + if (dis) { + discol = itemg.midlight(); + p->setPen(discol); + } + int xm = motifItemFrame + checkcol + motifItemHMargin; + QString s = mi->text(); + if (!s.isNull()) { + int t = s.find( '\t' ); + int m = motifItemVMargin; + const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine; + if (t >= 0) { + p->drawText(x+w-tab-windowsRightBorder-motifItemHMargin-motifItemFrame, + y+m, tab, h-2*m, text_flags, s.mid( t+1 )); + } + p->drawText(x+xm, y+m, w-xm-tab+1, h-2*m, text_flags, s, t); + } else if (mi->pixmap()) { + QPixmap *pixmap = mi->pixmap(); + if (pixmap->depth() == 1) + p->setBackgroundMode(OpaqueMode); + p->drawPixmap( x+xm, y+motifItemFrame, *pixmap); + if (pixmap->depth() == 1) + p->setBackgroundMode(TransparentMode); + } + if (mi->popup()) { + int dim = (h-2*motifItemFrame) / 2; + if (!dis) + discol = itemg.buttonText(); + QColorGroup g2(discol, itemg.highlight(), + white, white, + dis ? discol : white, + discol, white); + drawArrow(p, RightArrow, true, + x+w - motifArrowHMargin - motifItemFrame - dim, y+h/2-dim/2, + dim, dim, itemg, TRUE); + } + } + else + KStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, + enabled, x, y, w, h); +} + +int KDEStyle::popupMenuItemHeight(bool /*checkable*/, QMenuItem *mi, + const QFontMetrics &fm) +{ + if (mi->isSeparator()) + return 2; + + int h = 0; + if (mi->pixmap()) + h = mi->pixmap()->height(); + + if (mi->iconSet()) + h = QMAX(mi->iconSet()-> + pixmap(QIconSet::Small, QIconSet::Normal).height(), h); + + h = QMAX(fm.height() + 4, h); + + // we want a minimum size of 18 + h = QMAX(h, 18); + + return h; +} + +void KDEStyle::drawKProgressBlock(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, QBrush *fill) +{ + p->fillRect(x, y, w, h, fill ? *fill : g.brush(QColorGroup::Text)); +} + +void KDEStyle::drawFocusRect(QPainter *p, const QRect &r, + const QColorGroup &g, const QColor *c, + bool atBorder) +{ + /* + p->setPen(g.foreground()); + p->setBrush(NoBrush); + if ( atBorder ) + p->drawWinFocusRect( QRect( r.x()+1, r.y()+1, r.width()-2, r.height()-2 ) ); + else + p->drawWinFocusRect( r ); */ + KStyle::drawFocusRect(p, r, g, c, atBorder); +} + +void KDEStyle::polishPopupMenu(QPopupMenu *mnu) +{ + KStyle::polishPopupMenu(mnu); + // disabled for now because it breaks kicker + //(void)new KDEAniMenu(mnu); +} + +void KDEStyle::drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab, + bool selected) +{ + if(tabBar->shape() != QTabBar::RoundedAbove){ + KStyle::drawTab(p, tabBar, tab, selected); + return; + } + + QRect r = tab->rect(); + QColorGroup g = tabBar->colorGroup(); + if(!selected){ + r.setY(r.y()+1); + p->setPen(g.dark()); + p->drawLine(r.x(), r.y()+4, r.x(), r.bottom()-2); + p->drawLine(r.x(), r.y()+4, r.x()+4, r.y()); + p->drawLine(r.x()+4, r.y(), r.right()-1, r.y()); + p->drawLine(r.right(), r.y()+1, r.right(), r.bottom()-2); + + p->setPen(g.midlight()); + p->drawLine(r.x()+1, r.y()+4, r.x()+1, r.bottom()); + p->drawLine(r.x()+1, r.y()+4, r.x()+4, r.y()+1); + p->drawLine(r.x()+5, r.y()+1, r.right()-2, r.y()+1); + p->drawLine(r.x(), r.bottom(), r.right(), r.bottom()); + + p->setPen(g.mid()); + p->drawPoint(r.right()-1, r.y()+1); + p->drawLine(r.x()+4, r.y()+2, r.right()-1, r.y()+2); + p->drawLine(r.x()+3, r.y()+3, r.right()-1, r.y()+3); + + p->fillRect(r.x()+2, r.y()+4, r.width()-3, r.height()-6, + g.brush(QColorGroup::Mid)); + p->setPen(g.light()); + p->drawLine(r.x(), r.bottom()-1, r.right(), r.bottom()-1); + p->setPen(g.midlight()); + + } + else{ + p->setPen(g.light()); + p->drawLine(r.x(), r.y()+4, r.x(), r.bottom()); + p->drawLine(r.x(), r.y()+4, r.x()+4, r.y()); + p->drawLine(r.x()+4, r.y(), r.right()-1, r.y()); + p->setPen(g.dark()); + p->drawLine(r.right(), r.y()+1, r.right(), r.bottom()); + + p->setPen(g.midlight()); + p->drawLine(r.x()+1, r.y()+4, r.x()+1, r.bottom()); + p->drawLine(r.x()+1, r.y()+4, r.x()+4, r.y()+1); + p->drawLine(r.x()+5, r.y()+1, r.right() - 2, r.y()+1); + p->setPen(g.mid()); + p->drawLine(r.right()-1, r.y()+1, r.right()-1, r.bottom()); + } + +} + +void KDEStyle::drawTabMask(QPainter *p, const QTabBar*, QTab *tab, + bool ) + +{ + p->fillRect(tab->rect(), Qt::color1); +} + +void KDEStyle::tabbarMetrics(const QTabBar *t, int &hFrame, int &vFrame, + int &overlap) +{ + if(t->shape() == QTabBar::RoundedAbove){ + overlap = 0; + hFrame = 24; + vFrame = 10; + } + else + KStyle::tabbarMetrics(t, hFrame, vFrame, overlap); +} + + +void KDEStyle::drawSplitter(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, Orientation) +{ + int x2 = x+w-1; + int y2 = y+h-1; + p->setPen(g.dark()); + p->drawRect(x, y, w, h); + p->setPen(g.background()); + p->drawPoint(x, y); + p->drawPoint(x2, y); + p->drawPoint(x, y2); + p->drawPoint(x2, y2); + p->setPen(g.light()); + p->drawLine(x+1, y+1, x+1, y2-1); + p->drawLine(x+1, y+1, x2-1, y+1); + p->setPen(g.midlight()); + p->drawLine(x+2, y+2, x+2, y2-2); + p->drawLine(x+2, y+2, x2-2, y+2); + p->setPen(g.mid()); + p->drawLine(x2-1, y+1, x2-1, y2-1); + p->drawLine(x+1, y2-1, x2-1, y2-1); + p->fillRect(x+3, y+3, w-5, h-5, g.brush(QColorGroup::Background)); +} + +void KDEStyle::drawPanel(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool sunken, + int lineWidth, const QBrush *fill) +{ + if(lineWidth != 2 || !sunken) + KStyle::drawPanel(p, x, y, w, h, g, sunken, lineWidth, fill); + else{ + QPen oldPen = p->pen(); + int x2 = x+w-1; + int y2 = y+h-1; + p->setPen(g.light()); + p->drawLine(x, y2, x2, y2); + p->drawLine(x2, y, x2, y2); + p->setPen(g.mid()); + p->drawLine(x, y, x2, y); + p->drawLine(x, y, x, y2); + + p->setPen(g.midlight()); + p->drawLine(x+1, y2-1, x2-1, y2-1); + p->drawLine(x2-1, y+1, x2-1, y2-1); + p->setPen(g.dark()); + p->drawLine(x+1, y+1, x2-1, y+1); + p->drawLine(x+1, y+1, x+1, y2-1); + p->setPen(oldPen); + if(fill){ + // I believe here we are only supposed to fill if there is a + // specified fill brush... + p->fillRect(x+2, y+2, w-4, h-4, *fill); + } + } +} + +void KDEStyle::kColorBitmaps(QPainter *p, const QColorGroup &g, int x, int y, + QBitmap *lightColor, QBitmap *midColor, + QBitmap *midlightColor, QBitmap *darkColor, + QBitmap *blackColor, QBitmap *whiteColor) +{ + QBitmap *bitmaps[]={lightColor, midColor, midlightColor, darkColor, + blackColor, whiteColor}; + + QColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(), + Qt::black, Qt::white}; + + int i; + for(i=0; i < 6; ++i){ + if(bitmaps[i]){ + if(!bitmaps[i]->mask()) + bitmaps[i]->setMask(*bitmaps[i]); + p->setPen(colors[i]); + p->drawPixmap(x, y, *bitmaps[i]); + } + } +} + +void KDEStyle::drawKickerAppletHandle(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, QBrush *) +{ + //KStyle::drawKickerAppletHandle(p, x, y, w, h, g); + /* + if(h > w){ + int y2 = y+h-1; + + p->setPen(g.light()); + + p->drawLine(x+1, y+2, x+1, y2-2); + p->drawLine(x+4, y+2, x+4, y2-2); + + p->setPen(g.dark()); + p->drawLine(x+2, y+2, x+2, y2-2); + p->drawLine(x+5, y+2, x+5, y2-2); + + } + else{ + int x2 = x+w-1; + + p->setPen(g.light()); + + p->drawLine(x+2, y+1, x2-2, y+1); + p->drawLine(x+2, y+4, x2-2, y+4); + + p->setPen(g.dark()); + p->drawLine(x+2, y+2, x2-2, y+2); + p->drawLine(x+2, y+5, x2-2, y+5); + } + + */ +} + + diff --git a/ediv/ideQT/kdestyle.h b/ediv/ideQT/kdestyle.h new file mode 100644 index 0000000..fa17cc7 --- /dev/null +++ b/ediv/ideQT/kdestyle.h @@ -0,0 +1,177 @@ +#ifndef B2STYLE_H +#define B2STYLE_H + +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/*- + B2Style (C)2000 Daniel M. Duley + Animated menu code based on code by Mario Weilguni + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +*/ + +//class KDEAniMenuPrivate; + +class KDEAniMenu : public QObject +{ + Q_OBJECT +public: + KDEAniMenu(QPopupMenu *menu); + ~KDEAniMenu(); +protected: + void scrollIn(); +protected slots: + void slotDestroyFake(); + void slotFinished(); +private: + bool eventFilter(QObject *obj, QEvent *ev); + + QPopupMenu *mnu; + QWidget *widget; +// KDEAniMenuPrivate *d; +}; + +//class KDEStylePrivate; + +class KDEStyle : public QPlatinumStyle +{ + Q_OBJECT +public: + KDEStyle(); + ~KDEStyle(); + virtual void polish(QWidget *w); + virtual void unPolish(QWidget *w); + virtual void polish(QPalette &p); + void drawButton(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool sunken = FALSE, + const QBrush *fill = 0 ); + void drawButtonMask(QPainter *p, int x, int y, int w, int h); + void drawComboButtonMask(QPainter *p, int x, int y, int w, int h); + QRect buttonRect(int x, int y, int w, int h); + void drawBevelButton(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool sunken = FALSE, + const QBrush *fill = 0 ); + void drawPushButton(QPushButton *btn, QPainter *p); + virtual void drawPushButtonLabel (QPushButton *btn, QPainter *p); + void drawScrollBarControls(QPainter*, const QScrollBar*, int sliderStart, + uint controls, uint activeControl ); + QStyle::ScrollControl scrollBarPointOver(const QScrollBar *sb, + int sliderStart, const QPoint &p); + void scrollBarMetrics(const QScrollBar *sb, int &sliderMin, int &sliderMax, + int &sliderLength, int &buttonDim); + QSize indicatorSize() const; + void drawIndicator(QPainter* p, int x, int y, int w, int h, + const QColorGroup &g, int state, bool down = FALSE, + bool enabled = TRUE ); + void drawIndicatorMask(QPainter *p, int x, int y, int w, int h, int); + QSize exclusiveIndicatorSize() const; + void drawExclusiveIndicator(QPainter* p, int x, int y, int w, int h, + const QColorGroup &g, bool on, + bool down = FALSE, bool enabled = TRUE ); + void drawExclusiveIndicatorMask(QPainter *p, int x, int y, int w, + int h, bool); + void drawComboButton(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool sunken = FALSE, + bool editable = FALSE, bool enabled = TRUE, + const QBrush *fill = 0 ); + QRect comboButtonRect(int x, int y, int w, int h); + QRect comboButtonFocusRect(int x, int y, int w, int h); + int sliderLength() const; + void drawArrow(QPainter *p, Qt::ArrowType type, bool down, + int x, int y, int w, int h, const QColorGroup &g, + bool enabled=true, const QBrush *fill = 0); + void drawSlider(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, Orientation orient, + bool tickAbove, bool tickBelow); + void drawSliderMask(QPainter *p, int x, int y, int w, int h, + Orientation orient, bool, bool); +/* void drawKToolBar(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, KToolBarPos type, + QBrush *fill=NULL); + void drawKBarHandle(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, + KToolBarPos type, QBrush *fill=NULL); + void drawKMenuBar(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool macMode, + QBrush *fill=NULL); + void drawKToolBarButton(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool sunken=false, + bool raised = true, bool enabled = true, + bool popup = false, + KToolButtonType icontext = Icon, + const QString& btext=QString::null, + const QPixmap *icon=NULL, + QFont *font=NULL, QWidget *btn=NULL); + void drawKMenuItem(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool active, + QMenuItem *item, QBrush *fill=NULL);*/ + void drawPopupMenuItem(QPainter *p, bool checkable, int maxpmw, + int tab, QMenuItem *mi, const QPalette &pal, + bool act, bool enabled, int x, int y, int w, + int h); + int popupMenuItemHeight(bool c, QMenuItem *mi, const QFontMetrics &fm); + void drawKProgressBlock(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, QBrush *fill); + void drawFocusRect(QPainter *p, const QRect &r, const QColorGroup &g, + const QColor *pen, bool atBorder); + int defaultFrameWidth() const {return(2);} + void polishPopupMenu(QPopupMenu *mnu); + void drawTab(QPainter *p, const QTabBar *tabBar, QTab *tab, + bool selected); + void drawTabMask( QPainter*, const QTabBar*, QTab*, bool selected ); + void tabbarMetrics(const QTabBar *t, int &hFrame, int &vFrame, + int &overlap); + + void drawSplitter(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, Orientation orient); + int splitterWidth() const {return(6);} + void drawPanel(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, bool sunken, int lineWidth, + const QBrush *fill); + void drawKickerAppletHandle(QPainter *p, int x, int y, int w, int h, + const QColorGroup &g, QBrush *); + bool eventFilter(QObject *obj, QEvent *ev); +protected: + void drawSBDeco(QPainter *p, const QRect &r, const QColorGroup &g, + bool horiz); + void drawSBButton(QPainter *p, const QRect &r, const QColorGroup &g, + bool down=false); + void kColorBitmaps(QPainter *p, const QColorGroup &g, int x, int y, + QBitmap *lightColor=0, QBitmap *midColor=0, + QBitmap *midlightColor=0, QBitmap *darkColor=0, + QBitmap *blackColor=0, QBitmap *whiteColor=0); +private: + QColorGroup radioOnGrp; + QWidget *highlightWidget; + void polish(QApplication *a) { QStyle::polish(a); } + void unPolish(QApplication *a) {QStyle::unPolish(a); } + +// KDEStylePrivate *d; +}; + +#endif diff --git a/ediv/ideQT/moc_about.cpp b/ediv/ideQT/moc_about.cpp index 3a3d019..7430294 100644 --- a/ediv/ideQT/moc_about.cpp +++ b/ediv/ideQT/moc_about.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** About meta object code from reading C++ file 'about.h' ** -** Created: Mon Jul 8 15:45:30 2002 +** Created: Wed Oct 9 23:31:05 2002 ** by: The Qt MOC ($Id$) ** ** WARNING! All changes made in this file will be lost! diff --git a/ediv/ideQT/moc_ideqtwindow.cpp b/ediv/ideQT/moc_ideqtwindow.cpp index bd81a82..766f903 100644 --- a/ediv/ideQT/moc_ideqtwindow.cpp +++ b/ediv/ideQT/moc_ideqtwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ideQTWindow meta object code from reading C++ file 'ideqtwindow.h' ** -** Created: Fri Jul 12 23:18:31 2002 +** Created: Wed Oct 9 23:31:05 2002 ** by: The Qt MOC ($Id$) ** ** WARNING! All changes made in this file will be lost! diff --git a/ediv/ideQT/moc_kdestyle.cpp b/ediv/ideQT/moc_kdestyle.cpp new file mode 100644 index 0000000..7e5b40c --- /dev/null +++ b/ediv/ideQT/moc_kdestyle.cpp @@ -0,0 +1,130 @@ +/**************************************************************************** +** KDEAniMenu meta object code from reading C++ file 'kdestyle.h' +** +** Created: Wed Oct 9 23:31:04 2002 +** by: The Qt MOC ($Id$) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#define Q_MOC_KDEAniMenu +#if !defined(Q_MOC_OUTPUT_REVISION) +#define Q_MOC_OUTPUT_REVISION 8 +#elif Q_MOC_OUTPUT_REVISION != 8 +#error "Moc format conflict - please regenerate all moc files" +#endif + +#include "kdestyle.h" +#include +#include + +#if defined(Q_SPARCWORKS_FUNCP_BUG) +#define Q_AMPERSAND +#else +#define Q_AMPERSAND & +#endif + + +const char *KDEAniMenu::className() const +{ + return "KDEAniMenu"; +} + +QMetaObject *KDEAniMenu::metaObj = 0; + +void KDEAniMenu::initMetaObject() +{ + if ( metaObj ) + return; + if ( strcmp(QObject::className(), "QObject") != 0 ) + badSuperclassWarning("KDEAniMenu","QObject"); + (void) staticMetaObject(); +} + +#ifndef QT_NO_TRANSLATION +QString KDEAniMenu::tr(const char* s) +{ + return ((QNonBaseApplication*)qApp)->translate("KDEAniMenu",s); +} + +#endif // QT_NO_TRANSLATION +QMetaObject* KDEAniMenu::staticMetaObject() +{ + if ( metaObj ) + return metaObj; + (void) QObject::staticMetaObject(); +#ifndef QT_NO_PROPERTIES +#endif // QT_NO_PROPERTIES + typedef void(KDEAniMenu::*m1_t0)(); + typedef void(KDEAniMenu::*m1_t1)(); + m1_t0 v1_0 = Q_AMPERSAND KDEAniMenu::slotDestroyFake; + m1_t1 v1_1 = Q_AMPERSAND KDEAniMenu::slotFinished; + QMetaData *slot_tbl = QMetaObject::new_metadata(2); + QMetaData::Access *slot_tbl_access = QMetaObject::new_metaaccess(2); + slot_tbl[0].name = "slotDestroyFake()"; + slot_tbl[0].ptr = *((QMember*)&v1_0); + slot_tbl_access[0] = QMetaData::Protected; + slot_tbl[1].name = "slotFinished()"; + slot_tbl[1].ptr = *((QMember*)&v1_1); + slot_tbl_access[1] = QMetaData::Protected; + metaObj = QMetaObject::new_metaobject( + "KDEAniMenu", "QObject", + slot_tbl, 2, + 0, 0, +#ifndef QT_NO_PROPERTIES + 0, 0, + 0, 0, +#endif // QT_NO_PROPERTIES + 0, 0 ); + metaObj->set_slot_access( slot_tbl_access ); +#ifndef QT_NO_PROPERTIES +#endif // QT_NO_PROPERTIES + return metaObj; +} + + +const char *KDEStyle::className() const +{ + return "KDEStyle"; +} + +QMetaObject *KDEStyle::metaObj = 0; + +void KDEStyle::initMetaObject() +{ + if ( metaObj ) + return; + if ( strcmp(QPlatinumStyle::className(), "QPlatinumStyle") != 0 ) + badSuperclassWarning("KDEStyle","QPlatinumStyle"); + (void) staticMetaObject(); +} + +#ifndef QT_NO_TRANSLATION +QString KDEStyle::tr(const char* s) +{ + return ((QNonBaseApplication*)qApp)->translate("KDEStyle",s); +} + +#endif // QT_NO_TRANSLATION +QMetaObject* KDEStyle::staticMetaObject() +{ + if ( metaObj ) + return metaObj; + (void) QPlatinumStyle::staticMetaObject(); +#ifndef QT_NO_PROPERTIES +#endif // QT_NO_PROPERTIES + QMetaData::Access *slot_tbl_access = 0; + metaObj = QMetaObject::new_metaobject( + "KDEStyle", "QPlatinumStyle", + 0, 0, + 0, 0, +#ifndef QT_NO_PROPERTIES + 0, 0, + 0, 0, +#endif // QT_NO_PROPERTIES + 0, 0 ); + metaObj->set_slot_access( slot_tbl_access ); +#ifndef QT_NO_PROPERTIES +#endif // QT_NO_PROPERTIES + return metaObj; +} diff --git a/ediv/ideQT/moc_nuevo_propiedades.cpp b/ediv/ideQT/moc_nuevo_propiedades.cpp index 5efc781..658ae70 100644 --- a/ediv/ideQT/moc_nuevo_propiedades.cpp +++ b/ediv/ideQT/moc_nuevo_propiedades.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Nuevo_Propiedades meta object code from reading C++ file 'nuevo_propiedades.h' ** -** Created: Mon Sep 9 19:11:49 2002 +** Created: Wed Oct 9 23:31:05 2002 ** by: The Qt MOC ($Id$) ** ** WARNING! All changes made in this file will be lost! diff --git a/ediv/ideQT/moc_nuevoimpl.cpp b/ediv/ideQT/moc_nuevoimpl.cpp index 235c164..e4a509d 100644 --- a/ediv/ideQT/moc_nuevoimpl.cpp +++ b/ediv/ideQT/moc_nuevoimpl.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Nuevo meta object code from reading C++ file 'nuevoimpl.h' ** -** Created: Wed Jul 10 01:54:25 2002 +** Created: Wed Oct 9 23:31:05 2002 ** by: The Qt MOC ($Id$) ** ** WARNING! All changes made in this file will be lost! diff --git a/ediv/ideQT/moc_proyecto.cpp b/ediv/ideQT/moc_proyecto.cpp index 4505377..e595523 100644 --- a/ediv/ideQT/moc_proyecto.cpp +++ b/ediv/ideQT/moc_proyecto.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Proyecto meta object code from reading C++ file 'proyecto.h' ** -** Created: Mon Jul 15 22:13:13 2002 +** Created: Wed Oct 9 23:31:05 2002 ** by: The Qt MOC ($Id$) ** ** WARNING! All changes made in this file will be lost!