TDE
/
tde-style-qtcurve
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-style-qtcurve
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix inadvertent "TQ" changes.

Browse Source 
(cherry picked from commit 08dfb93438)
v3.5.13-sru
Darrell Anderson 13 years ago committed by Slávek Banko
parent 6272fc790d
commit 6fc27f0820
4 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File

50
common/common.h
Unescape Escape View File

@ -394,15 +394,15 @@ enum
#define RINGS_INNER_ALPHA(T) qtcRingAlpha[IMG_PLAIN_RINGS==(T) ? 1 : 0] //(IMG_PLAIN_RINGS==opts.bgndImage.type ? 0.25 : 0.125) #define RINGS_INNER_ALPHA(T) qtcRingAlpha[IMG_PLAIN_RINGS==(T) ? 1 : 0] //(IMG_PLAIN_RINGS==opts.bgndImage.type ? 0.25 : 0.125)
#define RINGS_OUTER_ALPHA qtcRingAlpha[2] //0.5 #define RINGS_OUTER_ALPHA qtcRingAlpha[2] //0.5
#define RINGS_WIDTH(T) (IMG_STQUARE_RINGS==T ? 260 : 450) #define RINGS_WIDTH(T) (IMG_SQUARE_RINGS==T ? 260 : 450)
#define RINGS_HEIGHT(T) (IMG_STQUARE_RINGS==T ? 220 : 360) #define RINGS_HEIGHT(T) (IMG_SQUARE_RINGS==T ? 220 : 360)
#define RINGS_STQUARE_LARGE_ALPHA (RINGS_OUTER_ALPHA*0.675) #define RINGS_SQUARE_LARGE_ALPHA (RINGS_OUTER_ALPHA*0.675)
#define RINGS_STQUARE_SMALL_ALPHA (RINGS_OUTER_ALPHA*0.50) #define RINGS_SQUARE_SMALL_ALPHA (RINGS_OUTER_ALPHA*0.50)
#define RINGS_STQUARE_LINE_WIDTH 20.0 #define RINGS_SQUARE_LINE_WIDTH 20.0
#define RINGS_STQUARE_RADIUS 18.0 #define RINGS_SQUARE_RADIUS 18.0
#define RINGS_STQUARE_LARGE_SIZE 120.0 #define RINGS_SQUARE_LARGE_SIZE 120.0
#define RINGS_STQUARE_SMALL_SIZE 100.0 #define RINGS_SQUARE_SMALL_SIZE 100.0
#if !defined __cplusplus #if !defined __cplusplus
#define MENU_AND_TOOLTIP_RADIUS (opts.round>=ROUND_FULL ? 5.0 : 3.5) #define MENU_AND_TOOLTIP_RADIUS (opts.round>=ROUND_FULL ? 5.0 : 3.5)
@ -529,7 +529,7 @@ typedef enum
IMG_NONE, IMG_NONE,
IMG_BORDERED_RINGS, IMG_BORDERED_RINGS,
IMG_PLAIN_RINGS, IMG_PLAIN_RINGS,
IMG_STQUARE_RINGS, IMG_SQUARE_RINGS,
IMG_FILE IMG_FILE
} EImageType; } EImageType;
@ -549,18 +549,18 @@ typedef struct
typedef enum typedef enum
{ {
STQUARE_NONE = 0x0000, SQUARE_NONE = 0x0000,
STQUARE_ENTRY = 0x0001, SQUARE_ENTRY = 0x0001,
STQUARE_PROGRESS = 0x0002, SQUARE_PROGRESS = 0x0002,
STQUARE_SCROLLVIEW = 0x0004, SQUARE_SCROLLVIEW = 0x0004,
STQUARE_LISTVIEW_SELECTION = 0x0008, SQUARE_LISTVIEW_SELECTION = 0x0008,
STQUARE_FRAME = 0x0010, SQUARE_FRAME = 0x0010,
STQUARE_TAB_FRAME = 0x0020, SQUARE_TAB_FRAME = 0x0020,
STQUARE_SLIDER = 0x0040, SQUARE_SLIDER = 0x0040,
STQUARE_SB_SLIDER = 0x0080, SQUARE_SB_SLIDER = 0x0080,
STQUARE_WINDOWS = 0x0100, SQUARE_WINDOWS = 0x0100,
STQUARE_TOOLTIPS = 0x0200, SQUARE_TOOLTIPS = 0x0200,
STQUARE_POPUP_MENUS = 0x0400 SQUARE_POPUP_MENUS = 0x0400
} ESquare; } ESquare;
typedef enum typedef enum
@ -1819,8 +1819,8 @@ ERound getWidgetRound(const Options *opts, int w, int h, EWidget widget)
{ {
ERound r=opts->round; ERound r=opts->round;
if( ((WIDGET_PBAR_TROUGH==widget || WIDGET_PROGRESSBAR==widget) && (opts->square&STQUARE_PROGRESS)) || if( ((WIDGET_PBAR_TROUGH==widget || WIDGET_PROGRESSBAR==widget) && (opts->square&SQUARE_PROGRESS)) ||
(WIDGET_ENTRY==widget && (opts->square&STQUARE_ENTRY)) ) (WIDGET_ENTRY==widget && (opts->square&SQUARE_ENTRY)) )
return ROUND_NONE; return ROUND_NONE;
if((WIDGET_CHECKBOX==widget || WIDGET_FOCUS==widget) && ROUND_NONE!=r) if((WIDGET_CHECKBOX==widget || WIDGET_FOCUS==widget) && ROUND_NONE!=r)
@ -1870,8 +1870,8 @@ static double getRadius(const Options *opts, int w, int h, EWidget widget, ERadi
if((WIDGET_CHECKBOX==widget || WIDGET_FOCUS==widget) && ROUND_NONE!=r) if((WIDGET_CHECKBOX==widget || WIDGET_FOCUS==widget) && ROUND_NONE!=r)
r=ROUND_SLIGHT; r=ROUND_SLIGHT;
if( ((WIDGET_PBAR_TROUGH==widget || WIDGET_PROGRESSBAR==widget) && (opts->square&STQUARE_PROGRESS)) || if( ((WIDGET_PBAR_TROUGH==widget || WIDGET_PROGRESSBAR==widget) && (opts->square&SQUARE_PROGRESS)) ||
(WIDGET_ENTRY==widget && (opts->square&STQUARE_ENTRY)) ) (WIDGET_ENTRY==widget && (opts->square&SQUARE_ENTRY)) )
return 0.0; return 0.0;
#if defined __cplusplus && ( (0x039999 >= 0x040000)) #if defined __cplusplus && ( (0x039999 >= 0x040000))

22
common/config_file.c
Unescape Escape View File

@ -515,7 +515,7 @@ static EImageType toImageType(const char *str, EImageType def)
if(0==memcmp(str, "rings", 5)) if(0==memcmp(str, "rings", 5))
return IMG_BORDERED_RINGS; return IMG_BORDERED_RINGS;
if(0==memcmp(str, "squarerings", 11)) if(0==memcmp(str, "squarerings", 11))
return IMG_STQUARE_RINGS; return IMG_SQUARE_RINGS;
if(0==memcmp(str, "file", 4)) if(0==memcmp(str, "file", 4))
return IMG_FILE; return IMG_FILE;
} }
@ -1528,7 +1528,7 @@ static void checkConfig(Options *opts)
opts->coloredTbarMo=true; opts->coloredTbarMo=true;
if(opts->round<ROUND_SLIGHT) if(opts->round<ROUND_SLIGHT)
opts->square|=STQUARE_POPUP_MENUS|STQUARE_TOOLTIPS; opts->square|=SQUARE_POPUP_MENUS|SQUARE_TOOLTIPS;
#endif #endif
if(opts->bgndOpacity<0 || opts->bgndOpacity>100) if(opts->bgndOpacity<0 || opts->bgndOpacity>100)
@ -1554,7 +1554,7 @@ static void checkConfig(Options *opts)
opts->activeTabAppearance=MODIFY_AGUA(opts->activeTabAppearance); opts->activeTabAppearance=MODIFY_AGUA(opts->activeTabAppearance);
opts->menuitemAppearance=MODIFY_AGUA(opts->menuitemAppearance); opts->menuitemAppearance=MODIFY_AGUA(opts->menuitemAppearance);
if(!opts->borderProgress && (!opts->fillProgress || !(opts->square&STQUARE_PROGRESS))) if(!opts->borderProgress && (!opts->fillProgress || !(opts->square&SQUARE_PROGRESS)))
opts->borderProgress=true; opts->borderProgress=true;
opts->titlebarAppearance=MODIFY_AGUA(opts->titlebarAppearance); opts->titlebarAppearance=MODIFY_AGUA(opts->titlebarAppearance);
@ -1724,18 +1724,18 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts)
if(opts->version<MAKE_VERSION(1, 4)) if(opts->version<MAKE_VERSION(1, 4))
{ {
opts->square= opts->square=
(readBoolEntry(cfg, "squareLvSelection", def->square&STQUARE_LISTVIEW_SELECTION) ? STQUARE_LISTVIEW_SELECTION : STQUARE_NONE)+ (readBoolEntry(cfg, "squareLvSelection", def->square&SQUARE_LISTVIEW_SELECTION) ? SQUARE_LISTVIEW_SELECTION : SQUARE_NONE)+
(readBoolEntry(cfg, "squareScrollViews", def->square&STQUARE_SCROLLVIEW) ? STQUARE_SCROLLVIEW : STQUARE_NONE)+ (readBoolEntry(cfg, "squareScrollViews", def->square&SQUARE_SCROLLVIEW) ? SQUARE_SCROLLVIEW : SQUARE_NONE)+
(readBoolEntry(cfg, "squareProgress", def->square&STQUARE_PROGRESS) ? STQUARE_PROGRESS : STQUARE_NONE)+ (readBoolEntry(cfg, "squareProgress", def->square&SQUARE_PROGRESS) ? SQUARE_PROGRESS : SQUARE_NONE)+
(readBoolEntry(cfg, "squareEntry", def->square&STQUARE_ENTRY)? STQUARE_ENTRY : STQUARE_NONE); (readBoolEntry(cfg, "squareEntry", def->square&SQUARE_ENTRY)? SQUARE_ENTRY : SQUARE_NONE);
} }
else else
CFG_READ_INT(square) CFG_READ_INT(square)
if(opts->version<MAKE_VERSION(1, 6)) if(opts->version<MAKE_VERSION(1, 6))
opts->square|=STQUARE_TOOLTIPS; opts->square|=SQUARE_TOOLTIPS;
if(opts->version<MAKE_VERSION3(1, 6, 1)) if(opts->version<MAKE_VERSION3(1, 6, 1))
opts->square|=STQUARE_POPUP_MENUS; opts->square|=SQUARE_POPUP_MENUS;
if(opts->version<MAKE_VERSION(1, 2)) if(opts->version<MAKE_VERSION(1, 2))
def->crSize=CR_SMALL_SIZE; def->crSize=CR_SMALL_SIZE;
if(opts->version<MAKE_VERSION(1, 0)) if(opts->version<MAKE_VERSION(1, 0))
@ -2459,7 +2459,7 @@ static void defaultSettings(Options *opts)
opts->boldProgress=true; opts->boldProgress=true;
opts->coloredTbarMo=false; opts->coloredTbarMo=false;
opts->borderSelection=false; opts->borderSelection=false;
opts->square=STQUARE_POPUP_MENUS; opts->square=SQUARE_POPUP_MENUS;
opts->stripedSbar=false; opts->stripedSbar=false;
opts->windowDrag=WM_DRAG_NONE; opts->windowDrag=WM_DRAG_NONE;
opts->shadePopupMenu=false; opts->shadePopupMenu=false;
@ -2960,7 +2960,7 @@ static const char * toStr(EImageType lv)
return "plainrings"; return "plainrings";
case IMG_BORDERED_RINGS: case IMG_BORDERED_RINGS:
return "rings"; return "rings";
case IMG_STQUARE_RINGS: case IMG_SQUARE_RINGS:
return "squarerings"; return "squarerings";
case IMG_FILE: case IMG_FILE:
return "file"; return "file";

56
style/qtcurve.cpp
Unescape Escape View File

@ -1168,7 +1168,7 @@ void TQtCurveStyle::polish(TQApplication *app)
else if ("kontact"==appName) else if ("kontact"==appName)
itsThemedApp=APP_KONTACT; itsThemedApp=APP_KONTACT;
else if ("konqueror"==appName) else if ("konqueror"==appName)
itsThemedApp=APP_KONTQUEROR; itsThemedApp=APP_KONQUEROR;
else if ("kate"==appName) else if ("kate"==appName)
itsThemedApp=APP_KATE; itsThemedApp=APP_KATE;
else if ("kpresenter"==appName) else if ("kpresenter"==appName)
@ -1516,7 +1516,7 @@ void TQtCurveStyle::polish(TQWidget *widget)
widget->installEventFilter(this); widget->installEventFilter(this);
#endif #endif
if ((opts.square&STQUARE_SCROLLVIEW) && widget && if ((opts.square&SQUARE_SCROLLVIEW) && widget &&
(::tqqt_cast<const TQScrollView *>(widget) || (::tqqt_cast<const TQScrollView *>(widget) ||
(widget->parentWidget() && ::tqqt_cast<const TQFrame *>(widget) && (widget->parentWidget() && ::tqqt_cast<const TQFrame *>(widget) &&
widget->parentWidget()->inherits("KateView"))) && widget->parentWidget()->inherits("KateView"))) &&
@ -3076,7 +3076,7 @@ void TQtCurveStyle::drawEntryField(TQPainter *p, const TQRect &rx, const TQColor
doEtch(!itsFormMode && opts.etchEntry && (!isSpin || opts.unifySpin) && WIDGET_COMBO!=w && DO_EFFECT), doEtch(!itsFormMode && opts.etchEntry && (!isSpin || opts.unifySpin) && WIDGET_COMBO!=w && DO_EFFECT),
reverse(TQApplication::reverseLayout()); reverse(TQApplication::reverseLayout());
if(WIDGET_SCROLLVIEW!=w && (opts.square&STQUARE_ENTRY)) if(WIDGET_SCROLLVIEW!=w && (opts.square&SQUARE_ENTRY))
round=ROUNDED_NONE; round=ROUNDED_NONE;
TQRect r(rx); TQRect r(rx);
@ -3811,7 +3811,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const
const TQColor *use(backgroundColors(cg)); const TQColor *use(backgroundColors(cg));
drawBorder(cg.background(), p, r, cg, (SFlags)(flags|Style_Horizontal), drawBorder(cg.background(), p, r, cg, (SFlags)(flags|Style_Horizontal),
opts.square&STQUARE_FRAME ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true, BORDER_FLAT); opts.square&SQUARE_FRAME ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true, BORDER_FLAT);
} }
else else
TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data); TQCommonStyle::tqdrawPrimitive(pe, p, r, cg, flags, data);
@ -3830,7 +3830,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const
{ {
const TQWidget *widget=p && p->device() ? dynamic_cast<const TQWidget *>(p->device()) : 0L; const TQWidget *widget=p && p->device() ? dynamic_cast<const TQWidget *>(p->device()) : 0L;
bool sv(widget && ::tqqt_cast<const TQScrollView *>(widget)), bool sv(widget && ::tqqt_cast<const TQScrollView *>(widget)),
square((opts.square&STQUARE_SCROLLVIEW) && square((opts.square&SQUARE_SCROLLVIEW) &&
(sv || (sv ||
(widget && widget->parentWidget() && ::tqqt_cast<const TQFrame *>(widget) && (widget && widget->parentWidget() && ::tqqt_cast<const TQFrame *>(widget) &&
widget->parentWidget()->inherits("KateView")))); widget->parentWidget()->inherits("KateView"))));
@ -3879,7 +3879,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const
drawBorder(cg.background(), p, r, cg, drawBorder(cg.background(), p, r, cg,
(SFlags)(flags|Style_Horizontal|Style_Enabled), (SFlags)(flags|Style_Horizontal|Style_Enabled),
opts.square&STQUARE_TAB_FRAME ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true, opts.square&SQUARE_TAB_FRAME ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true,
opts.borderTab ? BORDER_LIGHT : BORDER_RAISED, false); opts.borderTab ? BORDER_LIGHT : BORDER_RAISED, false);
break; break;
} }
@ -4203,7 +4203,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const
const TQWidget *widget=p && p->device() ? dynamic_cast<const TQWidget *>(p->device()) : 0L; const TQWidget *widget=p && p->device() ? dynamic_cast<const TQWidget *>(p->device()) : 0L;
bool scrollView=widget && ::tqqt_cast<const TQScrollView *>(widget); bool scrollView=widget && ::tqqt_cast<const TQScrollView *>(widget);
// if((opts.square&STQUARE_SCROLLVIEW) && scrollView) // if((opts.square&SQUARE_SCROLLVIEW) && scrollView)
// { // {
// const TQColor *use(backgroundColors(cg)); // const TQColor *use(backgroundColors(cg));
// //
@ -4253,7 +4253,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const
? ENTRY_FOCUS ? ENTRY_FOCUS
: ENTRY_NONE : ENTRY_NONE
: ENTRY_NONE, : ENTRY_NONE,
(opts.square&STQUARE_SCROLLVIEW) && scrollView ? ROUNDED_NONE : ROUNDED_ALL, (opts.square&SQUARE_SCROLLVIEW) && scrollView ? ROUNDED_NONE : ROUNDED_ALL,
scrollView ? WIDGET_SCROLLVIEW : WIDGET_ENTRY); scrollView ? WIDGET_SCROLLVIEW : WIDGET_ENTRY);
itsFormMode=false; itsFormMode=false;
break; break;
@ -4609,7 +4609,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi
int x(reverse ? r.x()+r.width()-1 : r.x()), int x(reverse ? r.x()+r.width()-1 : r.x()),
x2(reverse ? x-1 : x+1); x2(reverse ? x-1 : x+1);
p->setPen(itsBackgroundCols[!active && TAB_MO_GLOW==opts.tabMouseOver && opts.round>ROUND_SLIGHT && !(opts.square&STQUARE_TAB_FRAME) p->setPen(itsBackgroundCols[!active && TAB_MO_GLOW==opts.tabMouseOver && opts.round>ROUND_SLIGHT && !(opts.square&SQUARE_TAB_FRAME)
? ORIGINAL_SHADE : STD_BORDER]); ? ORIGINAL_SHADE : STD_BORDER]);
p->drawLine(x, r.y()+r.height()-1, x, r.height()-2); p->drawLine(x, r.y()+r.height()-1, x, r.height()-2);
if(active) if(active)
@ -4634,7 +4634,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi
} }
// Round top-left corner... // Round top-left corner...
if(!(opts.square&STQUARE_TAB_FRAME) && FULLLY_ROUNDED && APP_TORA!=itsThemedApp && firstTab && !active && !cornerWidget && !reverse) // && !isFirstKTabCtlTab) if(!(opts.square&SQUARE_TAB_FRAME) && FULLLY_ROUNDED && APP_TORA!=itsThemedApp && firstTab && !active && !cornerWidget && !reverse) // && !isFirstKTabCtlTab)
{ {
p->setPen(itsBackgroundCols[STD_BORDER]); p->setPen(itsBackgroundCols[STD_BORDER]);
p->drawPoint(r.x()+1, r.y()+r.height()-1); p->drawPoint(r.x()+1, r.y()+r.height()-1);
@ -4671,7 +4671,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi
cg, true, TAB_MO_TOP==opts.tabMouseOver); cg, true, TAB_MO_TOP==opts.tabMouseOver);
} }
if(TAB_MO_GLOW==opts.tabMouseOver && opts.round<=ROUND_SLIGHT && !(opts.square&STQUARE_TAB_FRAME) && !reverse && firstTab && !cornerWidget) if(TAB_MO_GLOW==opts.tabMouseOver && opts.round<=ROUND_SLIGHT && !(opts.square&SQUARE_TAB_FRAME) && !reverse && firstTab && !cornerWidget)
{ {
p->setPen(itsBackgroundCols[STD_BORDER]); p->setPen(itsBackgroundCols[STD_BORDER]);
p->drawPoint(r.x(), r.y()); p->drawPoint(r.x(), r.y());
@ -4690,7 +4690,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi
p->setClipping(false); p->setClipping(false);
} }
if(!(opts.square&STQUARE_TAB_FRAME) && FULLLY_ROUNDED && APP_TORA!=itsThemedApp && firstTab && !bottomCornerWidget)// && !isFirstKTabCtlTab) if(!(opts.square&SQUARE_TAB_FRAME) && FULLLY_ROUNDED && APP_TORA!=itsThemedApp && firstTab && !bottomCornerWidget)// && !isFirstKTabCtlTab)
{ {
p->setPen(itsBackgroundCols[STD_BORDER]); p->setPen(itsBackgroundCols[STD_BORDER]);
p->drawPoint(r.x(), reverse ? r.y()+r.width()-1 : r.y()); p->drawPoint(r.x(), reverse ? r.y()+r.width()-1 : r.y());
@ -5112,7 +5112,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi
if(opts.borderProgress) if(opts.borderProgress)
drawBorder(cg.background(), p, rx, cg, (SFlags)(flags|Style_Horizontal), drawBorder(cg.background(), p, rx, cg, (SFlags)(flags|Style_Horizontal),
(opts.square&STQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true, (opts.square&SQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, use, WIDGET_OTHER, true,
IS_FLAT(opts.progressGrooveAppearance) && ECOLOR_DARK!=opts.progressGrooveColor ? BORDER_SUNKEN : BORDER_FLAT); IS_FLAT(opts.progressGrooveAppearance) && ECOLOR_DARK!=opts.progressGrooveColor ? BORDER_SUNKEN : BORDER_FLAT);
else else
{ {
@ -5122,7 +5122,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi
} }
if(doEtch) if(doEtch)
drawEtch(p, r, cg, false, (opts.square&STQUARE_PROGRESS)); drawEtch(p, r, cg, false, (opts.square&SQUARE_PROGRESS));
break; break;
} }
@ -5143,7 +5143,7 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi
progress = (r.width()-barWidth)-(progress-(r.width()-barWidth)); progress = (r.width()-barWidth)-(progress-(r.width()-barWidth));
drawProgress(p, TQRect(r.x()+progress, r.y(), barWidth, r.height()), cg, flags, drawProgress(p, TQRect(r.x()+progress, r.y(), barWidth, r.height()), cg, flags,
(opts.square&STQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget); (opts.square&SQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget);
} }
else else
{ {
@ -5157,10 +5157,10 @@ void TQtCurveStyle::drawControl(ControlElement control, TQPainter *p, const TQWi
if(TQApplication::reverseLayout()) if(TQApplication::reverseLayout())
drawProgress(p, TQRect(cr.x()+(cr.width()-width), cr.y(), width, drawProgress(p, TQRect(cr.x()+(cr.width()-width), cr.y(), width,
cr.height()), cg, flags, cr.height()), cg, flags,
width==cr.width() || (opts.square&STQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget); width==cr.width() || (opts.square&SQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget);
else else
drawProgress(p, TQRect(cr.x(), cr.y(), width, cr.height()), cg, flags, drawProgress(p, TQRect(cr.x(), cr.y(), width, cr.height()), cg, flags,
width==cr.width() || (opts.square&STQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget); width==cr.width() || (opts.square&SQUARE_PROGRESS) ? ROUNDED_NONE : ROUNDED_ALL, widget);
} }
} }
break; break;
@ -5717,7 +5717,7 @@ void TQtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, con
? ENTRY_FOCUS ? ENTRY_FOCUS
: ENTRY_NONE : ENTRY_NONE
: ENTRY_NONE, : ENTRY_NONE,
(opts.square&STQUARE_ENTRY) (opts.square&SQUARE_ENTRY)
? ROUNDED_NONE ? ROUNDED_NONE
: opts.unifyCombo : opts.unifyCombo
? ROUNDED_ALL ? ROUNDED_ALL
@ -5808,7 +5808,7 @@ void TQtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, con
drawGlow(p, widget ? TQT_TQRECT_OBJECT(widget->rect()) : r, cg, WIDGET_COMBO, glowFocus ? itsFocusCols : NULL); drawGlow(p, widget ? TQT_TQRECT_OBJECT(widget->rect()) : r, cg, WIDGET_COMBO, glowFocus ? itsFocusCols : NULL);
else else
drawEtch(p, widget ? TQT_TQRECT_OBJECT(widget->rect()) : r, cg, drawEtch(p, widget ? TQT_TQRECT_OBJECT(widget->rect()) : r, cg,
!editable && EFFECT_SHADOW==opts.buttonEffect && !sunken, editable && (opts.square&STQUARE_ENTRY)); !editable && EFFECT_SHADOW==opts.buttonEffect && !sunken, editable && (opts.square&SQUARE_ENTRY));
} }
p->setPen(cg.buttonText()); p->setPen(cg.buttonText());
@ -5941,7 +5941,7 @@ void TQtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, con
} }
if(doEtch) if(doEtch)
drawEtch(p, spinwidget ? TQT_TQRECT_OBJECT(spinwidget->rect()) : r, cg, false, (opts.square&STQUARE_ENTRY)); drawEtch(p, spinwidget ? TQT_TQRECT_OBJECT(spinwidget->rect()) : r, cg, false, (opts.square&SQUARE_ENTRY));
} }
itsFormMode=false; itsFormMode=false;
break; break;
@ -6090,7 +6090,7 @@ void TQtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, con
drawLightBevel(p, sbRect, cg, sflags/*|Style_Down*/, drawLightBevel(p, sbRect, cg, sflags/*|Style_Down*/,
#ifndef SIMPLE_SCROLLBARS #ifndef SIMPLE_SCROLLBARS
!(opts.square&STQUARE_SB_SLIDER) && (SCROLLBAR_NONE==opts.scrollbarType || opts.flatSbarButtons) !(opts.square&SQUARE_SB_SLIDER) && (SCROLLBAR_NONE==opts.scrollbarType || opts.flatSbarButtons)
? ROUNDED_ALL : ? ROUNDED_ALL :
#endif #endif
ROUNDED_NONE, ROUNDED_NONE,
@ -6773,7 +6773,7 @@ int TQtCurveStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const
::tqqt_cast<const TQVBox *>(widget->parentWidget()->parentWidget())) ::tqqt_cast<const TQVBox *>(widget->parentWidget()->parentWidget()))
return 0; return 0;
if ((opts.square&STQUARE_SCROLLVIEW) && widget && ::tqqt_cast<const TQScrollView *>(widget)) if ((opts.square&SQUARE_SCROLLVIEW) && widget && ::tqqt_cast<const TQScrollView *>(widget))
return (opts.gtkScrollViews || opts.thinSbarGroove) && !opts.highlightScrollViews ? 1 : 2; return (opts.gtkScrollViews || opts.thinSbarGroove) && !opts.highlightScrollViews ? 1 : 2;
if(DO_EFFECT && opts.etchEntry && widget && !isFormWidget(widget) && if(DO_EFFECT && opts.etchEntry && widget && !isFormWidget(widget) &&
@ -6816,7 +6816,7 @@ int TQtCurveStyle::pixelMetric(PixelMetric metric, const TQWidget *widget) const
// See KHTML note at top of file // See KHTML note at top of file
return opts.sliderWidth+ return opts.sliderWidth+
(APP_KPRESENTER==itsThemedApp || (APP_KPRESENTER==itsThemedApp ||
((APP_KONTQUEROR==itsThemedApp || APP_KONTACT==itsThemedApp) && (!widget || isFormWidget(widget))) ((APP_KONQUEROR==itsThemedApp || APP_KONTACT==itsThemedApp) && (!widget || isFormWidget(widget)))
? 1 : 0); ? 1 : 0);
case PM_MaximumDragDistance: case PM_MaximumDragDistance:
return -1; return -1;
@ -7251,7 +7251,7 @@ void TQtCurveStyle::drawProgress(TQPainter *p, const TQRect &rx, const TQColorGr
} }
if(opts.borderProgress) if(opts.borderProgress)
drawBorder(cg.background(), p, r, cg, flags, !(opts.square&STQUARE_PROGRESS) && opts.fillProgress ? ROUNDED_ALL : round, drawBorder(cg.background(), p, r, cg, flags, !(opts.square&SQUARE_PROGRESS) && opts.fillProgress ? ROUNDED_ALL : round,
use, WIDGET_PROGRESSBAR, false, BORDER_FLAT, false, PBAR_BORDER); use, WIDGET_PROGRESSBAR, false, BORDER_FLAT, false, PBAR_BORDER);
else else
{ {
@ -7443,9 +7443,9 @@ void TQtCurveStyle::drawSbSliderHandle(TQPainter *p, const TQRect &orig, const T
flags|=Style_Horizontal; flags|=Style_Horizontal;
flags|=Style_Raised; flags|=Style_Raised;
drawLightBevel(p, r, cg, flags, (slider && !(opts.square&STQUARE_SLIDER)) drawLightBevel(p, r, cg, flags, (slider && !(opts.square&SQUARE_SLIDER))
#ifndef SIMPLE_SCROLLBARS #ifndef SIMPLE_SCROLLBARS
|| (!slider && !(opts.square&STQUARE_SB_SLIDER) && (SCROLLBAR_NONE==opts.scrollbarType || opts.flatSbarButtons)) || (!slider && !(opts.square&SQUARE_SB_SLIDER) && (SCROLLBAR_NONE==opts.scrollbarType || opts.flatSbarButtons))
#endif #endif
? ROUNDED_ALL : ROUNDED_NONE, ? ROUNDED_ALL : ROUNDED_NONE,
getFill(flags, use, false, SHADE_DARKEN==opts.shadeSliders), use, true, false, WIDGET_SB_SLIDER); getFill(flags, use, false, SHADE_DARKEN==opts.shadeSliders), use, true, false, WIDGET_SB_SLIDER);
@ -7695,7 +7695,7 @@ void TQtCurveStyle::drawSliderGroove(TQPainter *p, const TQRect &r, const TQColo
groove.addCoords(-1, 0, 1, 0); groove.addCoords(-1, 0, 1, 0);
} }
drawLightBevel(p, groove, cg, flags, opts.square&STQUARE_SLIDER ? ROUNDED_NONE : ROUNDED_ALL, drawLightBevel(p, groove, cg, flags, opts.square&SQUARE_SLIDER ? ROUNDED_NONE : ROUNDED_ALL,
itsBackgroundCols[flags&Style_Enabled ? 2 : ORIGINAL_SHADE], itsBackgroundCols[flags&Style_Enabled ? 2 : ORIGINAL_SHADE],
itsBackgroundCols, true, true, WIDGET_SLIDER_TROUGH); itsBackgroundCols, true, true, WIDGET_SLIDER_TROUGH);
@ -7724,7 +7724,7 @@ void TQtCurveStyle::drawSliderGroove(TQPainter *p, const TQRect &r, const TQColo
used.addCoords(0, pos, 0, 0); used.addCoords(0, pos, 0, 0);
} }
if(used.height()>0 && used.width()>0) if(used.height()>0 && used.width()>0)
drawLightBevel(p, used, cg, flags, opts.square&STQUARE_SLIDER ? ROUNDED_NONE : ROUNDED_ALL, drawLightBevel(p, used, cg, flags, opts.square&SQUARE_SLIDER ? ROUNDED_NONE : ROUNDED_ALL,
usedCols[ORIGINAL_SHADE], usedCols, true, true, WIDGET_FILLED_SLIDER_TROUGH); usedCols[ORIGINAL_SHADE], usedCols, true, true, WIDGET_FILLED_SLIDER_TROUGH);
} }
} }

2
style/qtcurve.h
Unescape Escape View File

@ -88,7 +88,7 @@ class TQtCurveStyle : public BASE_STYLE
APP_OPENOFFICE, APP_OPENOFFICE,
APP_MACTOR, APP_MACTOR,
APP_KPRESENTER, APP_KPRESENTER,
APP_KONTQUEROR, APP_KONQUEROR,
APP_SKIP_TASKBAR, APP_SKIP_TASKBAR,
APP_KPRINTER, APP_KPRINTER,
APP_KDIALOG, APP_KDIALOG,

Write Preview
Loading…
Cancel
Save