diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp
index 7fb0a53..5f95f66 100644
--- a/style/qtcurve.cpp
+++ b/style/qtcurve.cpp
@@ -235,15 +235,9 @@
inline bool isSpecialHover(TQWidget *w)
{
return w && (
-#if 0x039999 >= 0x030200
::tqqt_cast<TQRadioButton *>(w) ||
::tqqt_cast<TQCheckBox *>(w) ||
-#endif
::tqqt_cast<TQScrollBar *>(w) ||
-#if defined TDE_VERSION && TDE_VERSION >= 0x30400 && TDE_VERSION < 0x30500
- ::tqqt_cast<TQToolButton *>(w) ||
-
-#endif
::tqqt_cast<TQHeader *>(w) ||
::tqqt_cast<TQSpinWidget *>(w) ||
::tqqt_cast<TQComboBox *>(w) ||
@@ -481,7 +475,7 @@
return true;
w=w->parentWidget();
}
-
+
return false;
}
@@ -514,7 +508,7 @@
if(abs(now-lastCheck)<3)
return false;
-
+
TQColor highlight(TQApplication::palette().active().highlight());
bool inactiveEnabled(false),
changeSelectionColor(false),
@@ -923,7 +917,7 @@
itsButtonCols[ORIGINAL_SHADE]), itsDefBtnCols);
}
}
-
+
switch(opts.comboBtn)
{
default:
@@ -1164,10 +1158,10 @@
TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
TQString appName(getFile(app->argv()[0]));
-
+
if(NULL!=getenv("QTCURVE_DEBUG"))
std::cout << "QtCurve: Application name: \"" << appName.latin1() << "\"\n";
-
+
if ("kicker"==appName || "appletproxy"==appName)
{
itsThemedApp=APP_KICKER;
@@ -1218,7 +1212,7 @@
}
else
itsThemedApp=APP_OTHER;
-
+
if(APP_OPENOFFICE==itsThemedApp)
{
//
@@ -1229,21 +1223,21 @@
if(opts.useHighlightForMenu)
{
TQMetaObject *meta=(TQMetaObject *)metaObject();
-
- #ifdef USE_QT4
- #warning Qt4 does not allow the metaobject classname to be set (skipping)
- #else // USE_QT4
+
+#ifdef USE_QT4
+#warning Qt4 does not allow the metaobject classname to be set (skipping)
+#else // USE_QT4
meta->classname="HighContrastStyle";
- #endif // USE_QT4
+#endif // USE_QT4
}
-
+
if(opts.scrollbarType==SCROLLBAR_NEXT)
opts.scrollbarType=SCROLLBAR_KDE;
else if(opts.scrollbarType==SCROLLBAR_NONE)
opts.scrollbarType=SCROLLBAR_WINDOWS;
setSbType();
}
-
+
if(SHADE_NONE!=opts.menuStripe && opts.noMenuStripeApps.contains(appName))
opts.menuStripe=SHADE_NONE;
#ifdef TQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT
@@ -1325,7 +1319,7 @@
SHADE_BLEND_SELECTED==opts.comboBtn &&
(newContrast || newButton || newMenu)),
newSortedLv(itsSortedLvColors && ( (SHADE_BLEND_SELECTED==opts.sortedLv && itsHighlightCols!=itsSortedLvColors && itsSliderCols!=itsSortedLvColors &&
- itsComboBtnCols!=itsSortedLvColors) ||
+ itsComboBtnCols!=itsSortedLvColors) ||
SHADE_DARKEN==opts.sortedLv) &&
(newContrast || (opts.lvButton ? newButton : newGray))),
newCheckRadioSelCols(itsCheckRadioSelCols && ( (SHADE_BLEND_SELECTED==opts.crColor && itsDefBtnCols!=itsCheckRadioSelCols &&
@@ -1422,7 +1416,7 @@
// Force this to be re-generated!
if(SHADE_BLEND_SELECTED==opts.menuStripe)
opts.customMenuStripeColor=TQt::black;
-
+
if(APPEARANCE_STRIPED==opts.bgndAppearance)
pal.setBrush(TQColorGroup::Background, TQBrush(pal.active().background(), *createStripePixmap(pal.active().background(), true)));
}
@@ -1441,7 +1435,7 @@
if(dis)
mid=disable(act.foreground(), old.background());
-
+
const TQColor *use(backgroundColors(old));
TQColorGroup newGrp(old.foreground(), old.button(), use[0], use[STD_BORDER],
mid, old.text(), old.brightText(),
@@ -1460,7 +1454,7 @@
newGrp.setColor(TQColorGroup::ButtonText, disable(act.buttonText(), old.button()));
newGrp.setColor(TQColorGroup::Text, disable(act.text(), old.background()));
}
-
+
return newGrp;
}
@@ -1472,22 +1466,22 @@
TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
bool enableFilter(opts.highlightFactor || opts.coloredMouseOver);
-
+
if(::isKhtmlFormWidget(widget))
{
itsKhtmlWidgets[widget]=true;
connect(widget, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject *)));
}
-
+
if(enableFilter && isSpecialHover(widget))
connect(widget, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(hoverWidgetDestroyed(TQObject *)));
-
+
if(isWindowDragWidget(TQT_TQOBJECT(widget)))
installObjectEventHandler(ceData, elementFlags, ptr, this);
-
+
if(APPEARANCE_STRIPED==opts.bgndAppearance && (::tqqt_cast<TQDialog *>(widget) || ::tqqt_cast<TQMainWindow *>(widget)))
setBgndProp(widget, APPEARANCE_STRIPED);
-
+
if(widget->parentWidget() && ::tqqt_cast<TQScrollView *>(widget) && ::tqqt_cast<TQComboBox *>(widget->parentWidget()))
{
TQPalette pal(ceData.palette);
@@ -1495,7 +1489,7 @@
TQPalette orig(pal);
#endif
TQColorGroup act(pal.active());
-
+
#if 0
if(opts.gtkComboMenus)
act.setColor(TQColorGroup::Base, USE_LIGHTER_POPUP_MENU ? itsLighterPopupMenuBgndCol : itsBackgroundCols[ORIGINAL_SHADE]);
@@ -1504,42 +1498,44 @@
: TQApplication::palette().active().base());
#endif
act.setColor(TQColorGroup::Foreground, itsBackgroundCols[STD_BORDER]);
-
+
pal.setActive(act);
widget->setPalette(pal);
#if 0
//((TQScrollView *)widget)->setMargin(1);
-
+
const TQObjectList *children(widget->children());
-
+
if(children)
{
TQObjectList::Iterator it(children->begin()),
end(children->end());
-
+
for(; it!=end; ++it)
if(::tqqt_cast<TQWidget *>(*it))
((TQWidget *)(*it))->setPalette(orig);
}
#endif
}
-
+
if (APP_MACTOR==itsThemedApp && itsMactorPal && !ceData.widgetObjectTypes.contains("TQTipLabel"))
widget->setPalette(*itsMactorPal);
-
+
// Get rid of Kontact's frame...
if(APP_KONTACT==itsThemedApp && ::tqqt_cast<TQHBox *>(widget) && widget->parentWidget() &&
0==qstrcmp(widget->parentWidget()->className(), "Kontact::MainWindow"))
((TQHBox *)widget)->setLineWidth(0);
-
+
if(!IS_FLAT_BGND(opts.menuBgndAppearance) && ::tqqt_cast<const TQPopupMenu *>(widget))
+ {
installObjectEventHandler(ceData, elementFlags, ptr, this);
-
+ }
+
#if 0
if(opts.menubarHiding && ::tqqt_cast<TQMainWindow *>(widget) && static_cast<TQMainWindow *>(widget)->menuBar())
installObjectEventHandler(ceData, elementFlags, ptr, this);
#endif
-
+
if ((opts.square&SQUARE_SCROLLVIEW) && widget &&
(::tqqt_cast<const TQScrollView *>(widget) ||
(widget->parentWidget() && ::tqqt_cast<const TQFrame *>(widget) &&
@@ -1554,21 +1550,19 @@
else if ((USE_LIGHTER_POPUP_MENU || !IS_FLAT_BGND(opts.menuBgndAppearance)) && !opts.borderMenuitems &&
widget && ::tqqt_cast<const TQPopupMenu *>(widget))
((TQFrame *)widget)->setLineWidth(1);
-
+
if (::tqqt_cast<TQRadioButton *>(widget) || ::tqqt_cast<TQCheckBox *>(widget))
{
bool framelessGroupBoxCheckBox=(NO_FRAME(opts.groupBox) && isCheckBoxOfGroupBox(TQT_TQOBJECT(widget)));
-
+
if(framelessGroupBoxCheckBox || enableFilter)
{
- #if 0x039999 >= 0x030200
if(!isFormWidget(widget))
widget->setMouseTracking(true);
- #endif
if(framelessGroupBoxCheckBox)
{
TQFont fnt(ceData.font);
-
+
fnt.setBold(true);
widget->setFont(fnt);
}
** Diff limit reached (max: 250 lines) **
|