From b7d96aa82b20eafeecf272bd2b8eb59e9ca45d77 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 24 Feb 2012 15:29:11 -0600 Subject: Set COMPILE_TDE_SUPPORT instead of COMPILE_KDE_SUPPORT --- src/modules/options/optw_interfacelookglobal.cpp | 14 +++++++------- src/modules/options/optw_interfacelookglobal.h | 2 +- src/modules/options/optw_query.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/modules/options') diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index e5d0cd53..fe27dbd6 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -58,7 +58,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT createLayout(7,2); #else createLayout(5,2); @@ -66,7 +66,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * m_pUseTransparencyBoolSelector = addBoolSelector(0,0,1,0,__tr2qs_ctx("Enable fake transparency","options"),KviOption_boolUseGlobalPseudoTransparency); #ifdef COMPILE_INFO_TIPS - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT mergeTip(m_pUseTransparencyBoolSelector, __tr2qs_ctx("
This option makes all KVIrc windows look " \ "transparent.
You must choose a blending " \ @@ -93,7 +93,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),c,TQT_SLOT(setEnabled(bool))); // addRowSpacer(0,13,0,13); -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT m_pObtainBackgroundFromKdeBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use KDE desktop for transparency","options"),KviOption_boolObtainGlobalBackgroundFromKde, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,TQT_SLOT(setEnabled(bool))); @@ -107,11 +107,11 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * layout()->setRowStretch(6,1); connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool))); -#else //!COMPILE_KDE_SUPPORT +#else //!COMPILE_TDE_SUPPORT m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); layout()->setRowStretch(4,1); -#endif //!COMPILE_KDE_SUPPORT +#endif //!COMPILE_TDE_SUPPORT connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool))); connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool))); #else @@ -127,7 +127,7 @@ KviThemeTransparencyOptionsWidget::~KviThemeTransparencyOptionsWidget() void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(bool) { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && !(m_pObtainBackgroundFromKdeBoolSelector->isChecked())); #else m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked()); @@ -138,7 +138,7 @@ void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(boo void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bool) { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT m_pUpdateKdeBackgroundOnChangeBoolSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && m_pObtainBackgroundFromKdeBoolSelector->isChecked()); #endif #endif diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h index 3b20e1d3..62a55176 100644 --- a/src/modules/options/optw_interfacelookglobal.h +++ b/src/modules/options/optw_interfacelookglobal.h @@ -61,7 +61,7 @@ protected: #ifdef COMPILE_PSEUDO_TRANSPARENCY KviPixmapSelector * m_pGlobalBackgroundPixmapSelector; KviBoolSelector * m_pUseTransparencyBoolSelector; - #ifdef COMPILE_KDE_SUPPORT + #ifdef COMPILE_TDE_SUPPORT KviBoolSelector * m_pObtainBackgroundFromKdeBoolSelector; KviBoolSelector * m_pUpdateKdeBackgroundOnChangeBoolSelector; #endif diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index dfaca3bb..99403932 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -30,7 +30,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_TDE_SUPPORT #include #endif @@ -79,7 +79,7 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * parent) "will be displayed in the window.
","options")); #endif -#if defined(COMPILE_ON_WINDOWS) || (defined(COMPILE_KDE_SUPPORT) && (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2)) +#if defined(COMPILE_ON_WINDOWS) || (defined(COMPILE_TDE_SUPPORT) && (TDE_VERSION_MAJOR >= 3) && (TDE_VERSION_MINOR >= 2)) b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Flash system taskbar on new query message","options"),KviOption_boolFlashQueryWindowOnNewMessages); #ifdef COMPILE_INFO_TIPS mergeTip(b, -- cgit v1.2.1