By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1109
Collapse All | Expand All

(-)a/style/qtcurve.h.ORI (-6 / +6 lines)
Lines 1-5 Link Here
1
#ifndef __TQTCURVE_H__
1
#ifndef __QTCURVE_H__
2
#define __TQTCURVE_H__
2
#define __QTCURVE_H__
3
3
4
/*
4
/*
5
  TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
5
  TQtCurve (C) Craig Drummond, 2003 - 2010 craig.p.drummond@gmail.com
Lines 51-57 Link Here
51
*/
51
*/
52
52
53
#include "config.h"
53
#include "config.h"
54
#ifdef TQTC_TQT_ONLY
54
#ifdef QTC_QT_ONLY
55
#include "tqtc_kstyle.h"
55
#include "tqtc_kstyle.h"
56
#else
56
#else
57
#include <kdeversion.h>
57
#include <kdeversion.h>
Lines 68-74 Link Here
68
class TQTimer;
68
class TQTimer;
69
class TQSlider;
69
class TQSlider;
70
70
71
#ifdef TQTC_TQT_ONLY
71
#ifdef QTC_QT_ONLY
72
#define BASE_STYLE TQtCKStyle
72
#define BASE_STYLE TQtCKStyle
73
#else
73
#else
74
#define BASE_STYLE KStyle
74
#define BASE_STYLE KStyle
Lines 126-132 Link Here
126
        ENTRY_NONE
126
        ENTRY_NONE
127
    };
127
    };
128
128
129
#ifdef TQTC_STYLE_SUPPORT
129
#ifdef QTC_STYLE_SUPPORT
130
    TQtCurveStyle(const TQString &name=TQString());
130
    TQtCurveStyle(const TQString &name=TQString());
131
#else
131
#else
132
    TQtCurveStyle();
132
    TQtCurveStyle();
Lines 278-284 Link Here
278
    mutable TQColor             itsColoredBackgroundCols[TOTAL_SHADES+1];
278
    mutable TQColor             itsColoredBackgroundCols[TOTAL_SHADES+1];
279
    EApp                       itsThemedApp;
279
    EApp                       itsThemedApp;
280
    mutable TQCache<TQPixmap>    itsPixmapCache;
280
    mutable TQCache<TQPixmap>    itsPixmapCache;
281
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
281
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
282
    bool                       itsIsTransKicker;
282
    bool                       itsIsTransKicker;
283
#endif
283
#endif
284
    EHover                     itsHover;
284
    EHover                     itsHover;
(-)a/style/qtcurve.cpp.tqt (-21 / +21 lines)
Lines 62-68 Link Here
62
#include <tqtable.h>
62
#include <tqtable.h>
63
63
64
#include "config.h"
64
#include "config.h"
65
#ifndef TQTC_TQT_ONLY
65
#ifndef QTC_QT_ONLY
66
#include <kdeversion.h>
66
#include <kdeversion.h>
67
#endif
67
#endif
68
#include <tqsettings.h>
68
#include <tqsettings.h>
Lines 196-202 Link Here
196
                ? atoi(sessionVersion)<4
196
                ? atoi(sessionVersion)<4
197
                    ? 3
197
                    ? 3
198
                    : 4
198
                    : 4
199
#ifdef TQTC_DEFAULT_TO_KDE3
199
#ifdef QTC_DEFAULT_TO_KDE3
200
                : 3;
200
                : 3;
201
#else
201
#else
202
                : getenv("TDE_FULL_SESSION")
202
                : getenv("TDE_FULL_SESSION")
Lines 292-298 Link Here
292
    return kdeHome[trinity ? 0 : 1];
292
    return kdeHome[trinity ? 0 : 1];
293
}
293
}
294
294
295
#ifdef TQTC_STYLE_SUPPORT
295
#ifdef QTC_STYLE_SUPPORT
296
static void getStyles(const TQString &dir, const char *sub, TQStringList &styles)
296
static void getStyles(const TQString &dir, const char *sub, TQStringList &styles)
297
{
297
{
298
    TQDir d(dir+sub);
298
    TQDir d(dir+sub);
Lines 349-355 Link Here
349
        TQStringList list;
349
        TQStringList list;
350
        list << "TQtCurve";
350
        list << "TQtCurve";
351
351
352
#ifdef TQTC_STYLE_SUPPORT
352
#ifdef QTC_STYLE_SUPPORT
353
        getStyles(kdeHome(useTQt3Settings()), list);
353
        getStyles(kdeHome(useTQt3Settings()), list);
354
        getStyles(kdeHome(!useTQt3Settings()), list);
354
        getStyles(kdeHome(!useTQt3Settings()), list);
355
        getStyles(KDE_PREFIX(useTQt3Settings() ? 3 : 4), list);
355
        getStyles(KDE_PREFIX(useTQt3Settings() ? 3 : 4), list);
Lines 363-369 Link Here
363
    {
363
    {
364
        return "qtcurve"==s.lower()
364
        return "qtcurve"==s.lower()
365
                    ? new TQtCurveStyle
365
                    ? new TQtCurveStyle
366
#ifdef TQTC_STYLE_SUPPORT
366
#ifdef QTC_STYLE_SUPPORT
367
                    : 0==s.find(THEME_PREFIX)
367
                    : 0==s.find(THEME_PREFIX)
368
                        ? new TQtCurveStyle(s)
368
                        ? new TQtCurveStyle(s)
369
#endif
369
#endif
Lines 375-381 Link Here
375
375
376
#define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp || APP_KPRINTER==itsThemedApp || APP_KDIALOG==itsThemedApp)
376
#define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp || APP_KPRINTER==itsThemedApp || APP_KDIALOG==itsThemedApp)
377
377
378
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
378
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
379
#include <tqfile.h>
379
#include <tqfile.h>
380
#endif
380
#endif
381
381
Lines 393-399 Link Here
393
393
394
#define DW_BGND 105
394
#define DW_BGND 105
395
395
396
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
396
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
397
// Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent...
397
// Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent...
398
398
399
static bool kickerIsTrans()
399
static bool kickerIsTrans()
Lines 802-808 Link Here
802
    p->restore();
802
    p->restore();
803
}
803
}
804
804
805
#ifdef TQTC_STYLE_SUPPORT
805
#ifdef QTC_STYLE_SUPPORT
806
TQtCurveStyle::TQtCurveStyle(const TQString &name)
806
TQtCurveStyle::TQtCurveStyle(const TQString &name)
807
#else
807
#else
808
TQtCurveStyle::TQtCurveStyle()
808
TQtCurveStyle::TQtCurveStyle()
Lines 820-826 Link Here
820
              itsMdiColors(0L),
820
              itsMdiColors(0L),
821
              itsThemedApp(APP_OTHER),
821
              itsThemedApp(APP_OTHER),
822
              itsPixmapCache(150000, 499),
822
              itsPixmapCache(150000, 499),
823
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
823
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
824
              itsIsTransKicker(false),
824
              itsIsTransKicker(false),
825
#endif
825
#endif
826
              itsHover(HOVER_NONE),
826
              itsHover(HOVER_NONE),
Lines 835-841 Link Here
835
              itsDragWidget(0L),
835
              itsDragWidget(0L),
836
              itsDragWidgetHadMouseTracking(false)
836
              itsDragWidgetHadMouseTracking(false)
837
{
837
{
838
#ifdef TQTC_STYLE_SUPPORT
838
#ifdef QTC_STYLE_SUPPORT
839
    TQString rcFile;
839
    TQString rcFile;
840
    if(!name.isEmpty())
840
    if(!name.isEmpty())
841
    {
841
    {
Lines 1161-1167 Link Here
1161
    if ("kicker"==appName || "appletproxy"==appName)
1161
    if ("kicker"==appName || "appletproxy"==appName)
1162
    {
1162
    {
1163
        itsThemedApp=APP_KICKER;
1163
        itsThemedApp=APP_KICKER;
1164
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
1164
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
1165
        itsIsTransKicker=kickerIsTrans();
1165
        itsIsTransKicker=kickerIsTrans();
1166
#endif
1166
#endif
1167
    }
1167
    }
Lines 1196-1202 Link Here
1196
    else if ("korn"==appName)
1196
    else if ("korn"==appName)
1197
    {
1197
    {
1198
        itsThemedApp=APP_KORN;
1198
        itsThemedApp=APP_KORN;
1199
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
1199
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
1200
        itsIsTransKicker=kickerIsTrans();
1200
        itsIsTransKicker=kickerIsTrans();
1201
#endif
1201
#endif
1202
    }
1202
    }
Lines 1236-1242 Link Here
1236
1236
1237
    if(SHADE_NONE!=opts.menuStripe && opts.noMenuStripeApps.contains(appName))
1237
    if(SHADE_NONE!=opts.menuStripe && opts.noMenuStripeApps.contains(appName))
1238
        opts.menuStripe=SHADE_NONE;
1238
        opts.menuStripe=SHADE_NONE;
1239
#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
1239
#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
1240
    if(opts.fixParentlessDialogs && (opts.noDlgFixApps.contains(appName) || opts.noDlgFixApps.contains("kde")))
1240
    if(opts.fixParentlessDialogs && (opts.noDlgFixApps.contains(appName) || opts.noDlgFixApps.contains("kde")))
1241
        opts.fixParentlessDialogs=false;
1241
        opts.fixParentlessDialogs=false;
1242
#endif
1242
#endif
Lines 1762-1768 Link Here
1762
        ((TQGroupBox *)widget)->setFlat(false);
1762
        ((TQGroupBox *)widget)->setFlat(false);
1763
        ((TQGroupBox *)widget)->setFrameShape(TQFrame::NoFrame);
1763
        ((TQGroupBox *)widget)->setFrameShape(TQFrame::NoFrame);
1764
    }
1764
    }
1765
#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
1765
#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
1766
    else if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(widget))
1766
    else if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(widget))
1767
    {
1767
    {
1768
        TQDialog *dlg=(TQDialog *)widget;
1768
        TQDialog *dlg=(TQDialog *)widget;
Lines 1931-1937 Link Here
1931
    }
1931
    }
1932
    else if(widget->inherits("KTabCtl"))
1932
    else if(widget->inherits("KTabCtl"))
1933
        widget->removeEventFilter(this);
1933
        widget->removeEventFilter(this);
1934
#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
1934
#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
1935
    else if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(widget))
1935
    else if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(widget))
1936
        widget->removeEventFilter(this);
1936
        widget->removeEventFilter(this);
1937
#endif
1937
#endif
Lines 2277-2283 Link Here
2277
                    break;
2277
                    break;
2278
        }
2278
        }
2279
2279
2280
#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
2280
#ifdef QTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
2281
    if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(object))
2281
    if(opts.fixParentlessDialogs && ::tqqt_cast<TQDialog *>(object))
2282
    {
2282
    {
2283
        TQDialog *dlg=(TQDialog *)object;
2283
        TQDialog *dlg=(TQDialog *)object;
Lines 3152-3158 Link Here
3152
                if(flags&Style_Down)
3152
                if(flags&Style_Down)
3153
                    flags=((flags|Style_Down)^Style_Down)| Style_Sunken;
3153
                    flags=((flags|Style_Down)^Style_Down)| Style_Sunken;
3154
                flags|=Style_Enabled;
3154
                flags|=Style_Enabled;
3155
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
3155
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
3156
#if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500
3156
#if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500
3157
                if(HOVER_KICKER==itsHover && itsHoverWidget) //  && itsHoverWidget==p->device())
3157
                if(HOVER_KICKER==itsHover && itsHoverWidget) //  && itsHoverWidget==p->device())
3158
                    flags|=Style_MouseOver;
3158
                    flags|=Style_MouseOver;
Lines 3161-3167 Link Here
3161
#endif
3161
#endif
3162
                drawLightBevel(p, r, cg, flags|Style_Horizontal, ROUNDED_ALL,
3162
                drawLightBevel(p, r, cg, flags|Style_Horizontal, ROUNDED_ALL,
3163
                               getFill(flags, use), use, true, false);
3163
                               getFill(flags, use), use, true, false);
3164
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
3164
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
3165
                itsFormMode=false;
3165
                itsFormMode=false;
3166
#endif
3166
#endif
3167
            }
3167
            }
Lines 3313-3319 Link Here
3313
                            ? cg.background().dark(DW_BGND)
3313
                            ? cg.background().dark(DW_BGND)
3314
                            : */cg.background(),
3314
                            : */cg.background(),
3315
                           p, r, cg, glassMod ? flags : flags|Style_Horizontal,
3315
                           p, r, cg, glassMod ? flags : flags|Style_Horizontal,
3316
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
3316
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
3317
                           (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) ||
3317
                           (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) ||
3318
#endif
3318
#endif
3319
                           operaMdi || mdi
3319
                           operaMdi || mdi
Lines 3345-3351 Link Here
3345
3345
3346
                drawLightBevel(p, r, cg, glassMod ? flags : flags|Style_Horizontal,
3346
                drawLightBevel(p, r, cg, glassMod ? flags : flags|Style_Horizontal,
3347
                               flags&CHECK_BUTTON
3347
                               flags&CHECK_BUTTON
3348
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
3348
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
3349
                                 || (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe)
3349
                                 || (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe)
3350
#endif
3350
#endif
3351
                                    ? ROUNDED_NONE : ROUNDED_ALL,
3351
                                    ? ROUNDED_NONE : ROUNDED_ALL,
Lines 5540-5546 Link Here
5540
                    bflags|=NO_ETCH_BUTTON;
5540
                    bflags|=NO_ETCH_BUTTON;
5541
5541
5542
                // If we're pressed, on, or raised...
5542
                // If we're pressed, on, or raised...
5543
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
5543
#if defined QTC_QT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200
5544
                if(bflags &(Style_Down | Style_On | Style_Raised) || onControlButtons)
5544
                if(bflags &(Style_Down | Style_On | Style_Raised) || onControlButtons)
5545
#else
5545
#else
5546
                if(bflags &(Style_Down | Style_On | Style_Raised | Style_MouseOver) ||
5546
                if(bflags &(Style_Down | Style_On | Style_Raised | Style_MouseOver) ||

Return to bug 1109