diff options
Diffstat (limited to 'kstyles')
| -rw-r--r-- | kstyles/asteroid/Makefile.am | 2 | ||||
| -rw-r--r-- | kstyles/keramik/Makefile.am | 2 | ||||
| -rw-r--r-- | kstyles/plastik/plastik.cpp | 32 | ||||
| -rw-r--r-- | kstyles/plastik/plastik.h | 8 | ||||
| -rw-r--r-- | kstyles/utils/installtheme/Makefile.am | 2 |
5 files changed, 23 insertions, 23 deletions
diff --git a/kstyles/asteroid/Makefile.am b/kstyles/asteroid/Makefile.am index 2b8735e08..3d2bcab8c 100644 --- a/kstyles/asteroid/Makefile.am +++ b/kstyles/asteroid/Makefile.am @@ -11,7 +11,7 @@ noinst_HEADERS = asteroid.h kde_style_LTLIBRARIES = asteroid.la asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -asteroid_la_LIBADD = -ltdefx -lkutils +asteroid_la_LIBADD = -ltdefx -ltdeutils asteroid_la_SOURCES = asteroid.cpp themercdir = $(kde_datadir)/kstyle/themes diff --git a/kstyles/keramik/Makefile.am b/kstyles/keramik/Makefile.am index 83e1d4a03..4f3dbebae 100644 --- a/kstyles/keramik/Makefile.am +++ b/kstyles/keramik/Makefile.am @@ -15,7 +15,7 @@ noinst_PROGRAMS = genembed genembed_SOURCES = genembed.cpp genembed_LDADD = ../../tdefx/libtdefx.la -genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\ pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\ diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index e97cf6aed..77f6b0e1b 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -240,9 +240,9 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...? - khtmlWidgets[widget] = true; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(khtmlWidgetDestroyed(TQObject*))); + if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...? + tdehtmlWidgets[widget] = true; + connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject*))); } // use tqqt_cast where possible to check if the widget inheits one of the classes. might improve @@ -283,8 +283,8 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...? - khtmlWidgets.remove(widget); + if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...? + tdehtmlWidgets.remove(widget); } // use tqqt_cast to check if the widget inheits one of the classes. @@ -314,9 +314,9 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem KStyle::unPolish(ceData, elementFlags, ptr); } -void PlastikStyle::khtmlWidgetDestroyed(TQObject* obj) +void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj) { - khtmlWidgets.remove(TQT_TQWIDGET(obj)); + tdehtmlWidgets.remove(TQT_TQWIDGET(obj)); } void PlastikStyle::progressBarDestroyed(TQObject* obj) @@ -719,7 +719,7 @@ void PlastikStyle::renderButton(TQPainter *p, bool mouseOver, bool horizontal, bool enabled, - bool khtmlMode) const + bool tdehtmlMode) const { // small fix for the kicker buttons... if(kickerMode) enabled = true; @@ -728,7 +728,7 @@ void PlastikStyle::renderButton(TQPainter *p, uint contourFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom; if(!enabled) contourFlags|=Is_Disabled; - if(khtmlMode) contourFlags|=Draw_AlphaBlend; + if(tdehtmlMode) contourFlags|=Draw_AlphaBlend; uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom; if(horizontal) surfaceFlags|=Is_Horizontal; @@ -1526,8 +1526,8 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, case PE_ButtonTool: case PE_ButtonDropDown: case PE_ButtonCommand: { - bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.contains(opt.widget()); - renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlMode ); + bool tdehtmlMode = opt.isDefault() ? false : tdehtmlWidgets.contains(opt.widget()); + renderButton(p, r, cg, (on||down), mouseOver, true, enabled, tdehtmlMode ); break; } @@ -1884,12 +1884,12 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, // HACK!! // - // In order to draw nice edges in khtml, we need to paint alpha-blended. + // In order to draw nice edges in tdehtml, we need to paint alpha-blended. // On the other hand, we can't paint alpha-blended in normal widgets. // - // In this place there is no reliable way to detect if we are in khtml; the - // only thing we know is that khtml buffers its widgets into a pixmap. So - // when the paint device is a TQPixmap, chances are high that we are in khtml. + // In this place there is no reliable way to detect if we are in tdehtml; the + // only thing we know is that tdehtml buffers its widgets into a pixmap. So + // when the paint device is a TQPixmap, chances are high that we are in tdehtml. // It's possible that this breaks other things, so let's see how it works... if (p->device() && dynamic_cast<TQPixmap*>(p->device() ) ) { contourFlags += Draw_AlphaBlend; @@ -2816,7 +2816,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control, :cg.background(); uint contourFlags = 0; - if( khtmlWidgets.contains(cb) ) + if( tdehtmlWidgets.contains(cb) ) contourFlags |= Draw_AlphaBlend; if (_inputFocusHighlight && hasFocus && editable && enabled) diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h index 708666a7f..a1870b701 100644 --- a/kstyles/plastik/plastik.h +++ b/kstyles/plastik/plastik.h @@ -233,7 +233,7 @@ protected: bool mouseOver = false, bool horizontal = true, bool enabled = true, - bool khtmlMode = false) const; + bool tdehtmlMode = false) const; void renderPanel(TQPainter *p, const TQRect &r, @@ -269,7 +269,7 @@ protected: virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); protected slots: - void khtmlWidgetDestroyed(TQObject* w); + void tdehtmlWidgetDestroyed(TQObject* w); //Animation slots. void updateProgressPos(); @@ -300,8 +300,8 @@ private: TQColor _focusHighlightColor; TQColor _checkMarkColor; - // track khtml widgets. - TQMap<const TQWidget*,bool> khtmlWidgets; + // track tdehtml widgets. + TQMap<const TQWidget*,bool> tdehtmlWidgets; //Animation support. TQMap<TQWidget*, int> progAnimWidgets; diff --git a/kstyles/utils/installtheme/Makefile.am b/kstyles/utils/installtheme/Makefile.am index 2d7fab839..84272a681 100644 --- a/kstyles/utils/installtheme/Makefile.am +++ b/kstyles/utils/installtheme/Makefile.am @@ -10,7 +10,7 @@ bin_PROGRAMS = kinstalltheme kinstalltheme_SOURCES = main.cpp # the library search path. -kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. |