diff options
Diffstat (limited to 'src/gui/kdeext/klearlook.cpp')
| -rw-r--r-- | src/gui/kdeext/klearlook.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp index 9b57bb4..5b18d75 100644 --- a/src/gui/kdeext/klearlook.cpp +++ b/src/gui/kdeext/klearlook.cpp @@ -35,7 +35,6 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <tdeversion.h> #include <tqmenubar.h> #include <tqapplication.h> #include <tqpainter.h> @@ -73,11 +72,8 @@ DEALINGS IN THE SOFTWARE. #include <sys/types.h> #include "klearlook.h" #include <tqsettings.h> - -#if TDE_VERSION >= 0x30200 #include <tqfile.h> #include <tqdir.h> -#endif // Uncomment the following to enable gradients in toolbars and menubars // NOTE: Not yet complete!!! @@ -102,7 +98,6 @@ static const int itemFrame = 2; static const int arrowHMargin = 6; static const int rightBorder = 12; -#if TDE_VERSION >= 0x30200 // Try to read $TDEHOME/share/config/kickerrc to find out if kicker is transparent... static TQString readEnvPath( const char *env ) { @@ -150,7 +145,6 @@ static bool kickerIsTrans() { return trans; } -#endif inline int limit( double c ) { return c < 0.0 @@ -445,9 +439,7 @@ borderButton( bb ), borderFrame( bf ), rounded( round ), etchedSlider( etched ), pmProfile( PROFILE_SUNKEN ), vArrow( va ), boldDefText( bdt ), crLabelHighlight( crlh ), lvDark( lvd ), defBtnIndicator( dbi ), sliderThumbs( st ), handles( h ), toolbarBorders( tbb ), lvExpander( lve ), lvLines( lvl ), menuIcons( ico ), borderSplitter( true ), popupmenuHighlightLevel(popuplvl) #endif -#if TDE_VERSION >= 0x30200 isTransKicker( false ), -#endif hover( HOVER_NONE ), oldCursor( -1, -1 ), formMode( false ), @@ -524,18 +516,10 @@ void KlearlookStyle::applicationPolish( const TQStyleControlElementData &ceData, if ( !qstrcmp( app->argv() [ 0 ], "kicker" ) || !qstrcmp( app->argv() [ 0 ], "appletproxy" ) ) { themedApp = APP_KICKER; - #if TDE_VERSION >= 0x30200 - isTransKicker = rounded && kickerIsTrans(); - #endif - } else if ( !qstrcmp( app->argv() [ 0 ], "korn" ) ) { themedApp = APP_KORN; - #if TDE_VERSION >= 0x30200 - isTransKicker = rounded && kickerIsTrans(); - #endif - } else themedApp = qstrcmp( tqApp->argv() [ 0 ], "soffice.bin" ) ? APP_OTHER : APP_OPENOFFICE; } @@ -1350,22 +1334,16 @@ void KlearlookStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQS if ( flags & Style_Down ) flags = ( ( flags | Style_Down ) ^ Style_Down ) | Style_Sunken; flags |= Style_Enabled; -#if TDE_VERSION >= 0x30200 -#if TDE_VERSION >= 0x30400 if ( HOVER_KICKER == hover && hoverWidget ) // && hoverWidget==p->device()) flags |= Style_MouseOver; -#endif formMode = isTransKicker; -#endif drawLightBevelButton( p, r, cg, flags | Style_Horizontal, true, ROUNDED_ALL, getFill( flags, use ), use ); -#if TDE_VERSION >= 0x30200 formMode = false; -#endif } else { flags = ( ( flags | Style_Sunken ) ^ Style_Sunken ) | Style_Raised; @@ -1395,9 +1373,7 @@ void KlearlookStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQS drawLightBevelButton( p, r, cg, flags | Style_Horizontal, true, r.width() < 16 || r.height() < 16 -#if TDE_VERSION >= 0x30200 || ( APP_KORN == themedApp && isTransKicker && PE_ButtonTool == pe ) -#endif ? ROUNDED_NONE : ROUNDED_ALL, getFill( flags, use ), use ); break; @@ -3125,12 +3101,7 @@ void KlearlookStyle::drawComplexControl( if ( controls & SC_ToolButton ) { // If we're pressed, on, or raised... -#if TDE_VERSION >= 0x30200 if ( bflags & ( Style_Down | Style_On | Style_Raised ) || onControlButtons ) -#else - // CPD: Style_MouseOver obove is *needed* for KDE's TDEToggleActions... - if ( bflags & ( Style_Down | Style_On | Style_Raised | Style_MouseOver ) || onControlButtons ) -#endif { //Make sure the standalone toolbuttons have a gradient in the right direction @@ -3970,14 +3941,12 @@ bool KlearlookStyle::redrawHoverWidget() { ( HOVER_SB_ADD == hover && !addline.contains( oldCursor ) ) || ( HOVER_SB_ADD != hover && addline.contains( oldCursor ) ); } else { -#if TDE_VERSION >= 0x30400 TQToolButton *tb = dynamic_cast<TQToolButton *>( hoverWidget ); if ( tb ) { hover = APP_KICKER == themedApp ? HOVER_KICKER : HOVER_NONE; return HOVER_KICKER == hover; } else { -#endif TQHeader *hd = dynamic_cast<TQHeader *>( hoverWidget ); if ( hd ) { @@ -4018,11 +3987,7 @@ bool KlearlookStyle::redrawHoverWidget() { return redraw; } else return oldCursor == TQPoint( -1, -1 ); -#if TDE_VERSION >= 0x30400 - } -#endif - } } } |