From ae2e61a1cb647701033ddda4bf7627bc0c00f837 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 23:21:29 -0600
Subject: Fix prior commit

---
 src/modules/options/optw_interfacelookglobal.cpp   | 215 ---------------------
 src/modules/options/optw_interfacelookglobal.h     | 118 -----------
 src/modules/options/optw_interfacelootdeglobal.cpp | 215 +++++++++++++++++++++
 src/modules/options/optw_interfacelootdeglobal.h   | 118 +++++++++++
 4 files changed, 333 insertions(+), 333 deletions(-)
 delete mode 100644 src/modules/options/optw_interfacelookglobal.cpp
 delete mode 100644 src/modules/options/optw_interfacelookglobal.h
 create mode 100644 src/modules/options/optw_interfacelootdeglobal.cpp
 create mode 100644 src/modules/options/optw_interfacelootdeglobal.h

diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
deleted file mode 100644
index 8364a7e2..00000000
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-//
-//   File : optw_interfacelootdeglobal.cpp
-//   Creation date : Sun Jun 3 2001 20:50:13 CEST by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-
-#include "optw_interfacelootdeglobal.h"
-
-#include <tqlayout.h>
-
-#include "kvi_settings.h"
-#include "kvi_options.h"
-#include "kvi_locale.h"
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * parent)
-: KviOptionsWidget(parent)
-{
-	createLayout(4,2);
-
-	KviBoolSelector * b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Use global application font","options"),KviOption_boolUseGlobalApplicationFont);
-	KviBoolSelector * g = addBoolSelector(0,0,1,0,__tr2qs_ctx("Hide icons in Popup","options"),KviOption_boolDisablePopupIcons);
-	KviFontSelector * f = addFontSelector(0,2,1,2,__tr2qs_ctx("Global application font:","options"),KviOption_fontApplication,
-							KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont));
-
-	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool)));
-
-	addRowSpacer(0,3,1,3);
-}
-
-KviThemeGeneralOptionsWidget::~KviThemeGeneralOptionsWidget()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * parent)
-: KviOptionsWidget(parent)
-{
-#ifdef COMPILE_PSEUDO_TRANSPARENCY
-
-	#ifdef COMPILE_TDE_SUPPORT
-		createLayout(7,2);
-	#else
-		createLayout(5,2);
-	#endif
-
-	m_pUseTransparencyBoolSelector = addBoolSelector(0,0,1,0,__tr2qs_ctx("Enable fake transparency","options"),KviOption_boolUseGlobalPseudoTransparency);
-#ifdef COMPILE_INFO_TIPS
-	#ifdef COMPILE_TDE_SUPPORT
-		mergeTip(m_pUseTransparencyBoolSelector,
-			__tr2qs_ctx("<center>This option makes all KVIrc windows look " \
-				"transparent.<br>You must choose a blending " \
-				"background image to below or check the " \
-				"\"Use KDE desktop for transparency\" option.</center>","options"));
-	#else
-		mergeTip(m_pUseTransparencyBoolSelector,
-			__tr2qs_ctx("<center>This option makes all KVIrc windows look " \
-				"like transparent.<br>You must choose a blending " \
-				"background image to below.</center>","options"));
-	#endif
-#endif
-
-	KviUIntSelector * u = addUIntSelector(0,1,1,1,__tr2qs_ctx("Child window opacity:","options"),KviOption_uintGlobalTransparencyChildFadeFactor,
-							0,100,35,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
-
-	u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Parent window opacity:","options"),KviOption_uintGlobalTransparencyParentFadeFactor,
-							0,100,10,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
-
-	KviColorSelector * c = addColorSelector(0,3,1,3,__tr2qs_ctx("Blend color:","options"),KviOption_colorGlobalTransparencyFade,
-						KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),c,TQT_SLOT(setEnabled(bool)));
-
-//	addRowSpacer(0,13,0,13);
-#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)));
-	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
-
-	m_pUpdateKdeBackgroundOnChangeBoolSelector = addBoolSelector(0,5,1,5,__tr2qs_ctx("Keep in sync with KDE background changes","options"),KviOption_boolUpdateKdeBackgroundOnChange,
-				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
-
-	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
-				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
-	layout()->setRowStretch(6,1);
-	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
-
-#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_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
-	createLayout(1,1);
-	addRowSpacer(0,0,0,0);
-#endif
-}
-
-KviThemeTransparencyOptionsWidget::~KviThemeTransparencyOptionsWidget()
-{
-}
-
-void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(bool)
-{
-#ifdef COMPILE_PSEUDO_TRANSPARENCY
-	#ifdef COMPILE_TDE_SUPPORT
-		m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && !(m_pObtainBackgroundFromKdeBoolSelector->isChecked()));
-	#else
-		m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked());
-	#endif
-#endif
-}
-
-void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bool)
-{
-#ifdef COMPILE_PSEUDO_TRANSPARENCY
-	#ifdef COMPILE_TDE_SUPPORT
-		m_pUpdateKdeBackgroundOnChangeBoolSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && m_pObtainBackgroundFromKdeBoolSelector->isChecked());
-	#endif
-#endif
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(TQWidget * parent)
-: KviOptionsWidget(parent)
-{
-	createLayout(7,1);
-
-	addColorSelector(0,0,0,0,__tr2qs_ctx("Active Background","options"),KviOption_colorMdiCaptionActive);
-	addColorSelector(0,1,0,1,__tr2qs_ctx("Inactive Background","options"),KviOption_colorMdiCaptionInactive);
-	addColorSelector(0,2,0,2,__tr2qs_ctx("Active Text (Primary)","options"),KviOption_colorCaptionTextActive);
-	addColorSelector(0,3,0,3,__tr2qs_ctx("Active Text (Secondary)","options"),KviOption_colorCaptionTextActive2);
-	addColorSelector(0,4,0,4,__tr2qs_ctx("Inactive Text (Primary)","options"),KviOption_colorCaptionTextInactive);
-	addColorSelector(0,5,0,5,__tr2qs_ctx("Inactive Text (Secondary)","options"),KviOption_colorCaptionTextInactive2);
-
-	addRowSpacer(0,6,0,6);
-}
-
-KviThemeMdiCaptionsOptionsWidget::~KviThemeMdiCaptionsOptionsWidget()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * parent)
-: KviOptionsWidget(parent)
-{
-	createLayout(2,1);
-
-	addColorSelector(0,0,0,0,__tr2qs_ctx("Background","options"),KviOption_colorMdiBackground);
-	addPixmapSelector(0,1,0,1,__tr2qs_ctx("Background Image","options"),KviOption_pixmapMdiBackground);
-
-	layout()->setRowStretch(1,1);
-}
-
-KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidget * parent)
-: KviOptionsWidget(parent)
-{
-	createLayout(9,1);
-	
-	addFontSelector(0,0,0,0,__tr2qs_ctx("Font","options"),KviOption_fontIrcToolBarApplet);
-	
-	addColorSelector(0,1,0,1,__tr2qs_ctx("Background","options"),KviOption_colorIrcToolBarAppletBackground);
-	addColorSelector(0,2,0,2,__tr2qs_ctx("Low-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundLowContrast);
-	addColorSelector(0,3,0,3,__tr2qs_ctx("Mid-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundMidContrast);
-	addColorSelector(0,4,0,4,__tr2qs_ctx("Active High-Contrast Foreground (Primary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive1);
-	addColorSelector(0,5,0,5,__tr2qs_ctx("Active High-Contrast Foreground (Secondary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive2);
-	addColorSelector(0,6,0,6,__tr2qs_ctx("Inactive High-Contrast Foreground (Primary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive1);
-	addColorSelector(0,7,0,7,__tr2qs_ctx("Inactive High-Contrast Foreground (Secondary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive2);
-
-	addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background Image","options"),KviOption_pixmapIrcToolBarAppletBackground);
-
-	layout()->setRowStretch(8,1);
-}
-
-KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget()
-{
-}
-
-
-#include "m_optw_interfacelootdeglobal.moc"
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h
deleted file mode 100644
index 0259873c..00000000
--- a/src/modules/options/optw_interfacelookglobal.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _OPTW_INTERFACELOOKGLOBAL_H_
-#define _OPTW_INTERFACELOOKGLOBAL_H_
-
-//
-//   File : optw_interfacelootdeglobal.h
-//   Creation date : Sun Jun 3 2001 20:49:02 CEST by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-
-#include "kvi_settings.h"
-#include "kvi_optionswidget.h"
-#include "kvi_selectors.h"
-
-
-#define KVI_OPTIONS_WIDGET_ICON_KviThemeGeneralOptionsWidget KVI_SMALLICON_GUI
-#define KVI_OPTIONS_WIDGET_NAME_KviThemeGeneralOptionsWidget __tr2qs_no_lookup("General")
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeGeneralOptionsWidget __tr2qs_no_lookup("theme")
-#define KVI_OPTIONS_WIDGET_GROUP_KviThemeGeneralOptionsWidget "theme"
-
-
-class KviThemeGeneralOptionsWidget : public KviOptionsWidget
-{
-	Q_OBJECT
-  
-public:
-	KviThemeGeneralOptionsWidget(TQWidget * parent);
-	~KviThemeGeneralOptionsWidget();
-};
-
-
-#define KVI_OPTIONS_WIDGET_ICON_KviThemeTransparencyOptionsWidget KVI_SMALLICON_TRANSPARENT
-#define KVI_OPTIONS_WIDGET_NAME_KviThemeTransparencyOptionsWidget __tr2qs_no_lookup("Transparency")
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeTransparencyOptionsWidget __tr2qs_no_lookup("theme,background")
-#define KVI_OPTIONS_WIDGET_GROUP_KviThemeTransparencyOptionsWidget "theme"
-
-
-class KviThemeTransparencyOptionsWidget : public KviOptionsWidget
-{
-	Q_OBJECT
-  
-public:
-	KviThemeTransparencyOptionsWidget(TQWidget * parent);
-	~KviThemeTransparencyOptionsWidget();
-protected:
-#ifdef COMPILE_PSEUDO_TRANSPARENCY
-	KviPixmapSelector * m_pGlobalBackgroundPixmapSelector;
-	KviBoolSelector * m_pUseTransparencyBoolSelector;
-	#ifdef COMPILE_TDE_SUPPORT
-		KviBoolSelector * m_pObtainBackgroundFromKdeBoolSelector;
-		KviBoolSelector * m_pUpdateKdeBackgroundOnChangeBoolSelector;
-	#endif
-#endif
-protected slots:
-	void enableGlobalBackgroundPixmapSelector(bool);
-	void enableUpdateKdeBackgroundBoolSelector(bool);
-};
-
-
-#define KVI_OPTIONS_WIDGET_ICON_KviThemeMdiCaptionsOptionsWidget KVI_SMALLICON_CAPTION
-#define KVI_OPTIONS_WIDGET_NAME_KviThemeMdiCaptionsOptionsWidget __tr2qs_no_lookup("Window Captions")
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget __tr2qs_no_lookup("theme,mdi")
-#define KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget "theme"
-
-class KviThemeMdiCaptionsOptionsWidget : public KviOptionsWidget
-{
-	Q_OBJECT
-  
-public:
-	KviThemeMdiCaptionsOptionsWidget(TQWidget * parent);
-	~KviThemeMdiCaptionsOptionsWidget();
-};
-
-#define KVI_OPTIONS_WIDGET_ICON_KviThemeMdiAreaOptionsWidget KVI_SMALLICON_APPLET
-#define KVI_OPTIONS_WIDGET_NAME_KviThemeMdiAreaOptionsWidget __tr2qs_no_lookup("Workspace")
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiAreaOptionsWidget __tr2qs_no_lookup("theme,mdi")
-#define KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiAreaOptionsWidget "theme"
-
-class KviThemeMdiAreaOptionsWidget : public KviOptionsWidget
-{
-	Q_OBJECT
-  
-public:
-	KviThemeMdiAreaOptionsWidget(TQWidget * parent);
-	~KviThemeMdiAreaOptionsWidget();
-};
-
-#define KVI_OPTIONS_WIDGET_ICON_KviThemeToolBarAppletsOptionsWidget KVI_SMALLICON_APPLET
-#define KVI_OPTIONS_WIDGET_NAME_KviThemeToolBarAppletsOptionsWidget __tr2qs_no_lookup("ToolBar Applets")
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeToolBarAppletsOptionsWidget __tr2qs_no_lookup("theme,toolbar")
-#define KVI_OPTIONS_WIDGET_GROUP_KviThemeToolBarAppletsOptionsWidget "theme"
-
-
-class KviThemeToolBarAppletsOptionsWidget : public KviOptionsWidget
-{
-	Q_OBJECT
-  
-public:
-	KviThemeToolBarAppletsOptionsWidget(TQWidget * parent);
-	~KviThemeToolBarAppletsOptionsWidget();
-};
-
-#endif //!_OPTW_INTERFACELOOKGLOBAL_H_
diff --git a/src/modules/options/optw_interfacelootdeglobal.cpp b/src/modules/options/optw_interfacelootdeglobal.cpp
new file mode 100644
index 00000000..8364a7e2
--- /dev/null
+++ b/src/modules/options/optw_interfacelootdeglobal.cpp
@@ -0,0 +1,215 @@
+//
+//   File : optw_interfacelootdeglobal.cpp
+//   Creation date : Sun Jun 3 2001 20:50:13 CEST by Szymon Stefanek
+//
+//   This file is part of the KVirc irc client distribution
+//   Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)
+//
+//   This program is FREE software. You can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your opinion) any later version.
+//
+//   This program is distributed in the HOPE that it will be USEFUL,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//   See the GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, write to the Free Software Foundation,
+//   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+
+#include "optw_interfacelootdeglobal.h"
+
+#include <tqlayout.h>
+
+#include "kvi_settings.h"
+#include "kvi_options.h"
+#include "kvi_locale.h"
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
+{
+	createLayout(4,2);
+
+	KviBoolSelector * b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Use global application font","options"),KviOption_boolUseGlobalApplicationFont);
+	KviBoolSelector * g = addBoolSelector(0,0,1,0,__tr2qs_ctx("Hide icons in Popup","options"),KviOption_boolDisablePopupIcons);
+	KviFontSelector * f = addFontSelector(0,2,1,2,__tr2qs_ctx("Global application font:","options"),KviOption_fontApplication,
+							KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont));
+
+	connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool)));
+
+	addRowSpacer(0,3,1,3);
+}
+
+KviThemeGeneralOptionsWidget::~KviThemeGeneralOptionsWidget()
+{
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
+{
+#ifdef COMPILE_PSEUDO_TRANSPARENCY
+
+	#ifdef COMPILE_TDE_SUPPORT
+		createLayout(7,2);
+	#else
+		createLayout(5,2);
+	#endif
+
+	m_pUseTransparencyBoolSelector = addBoolSelector(0,0,1,0,__tr2qs_ctx("Enable fake transparency","options"),KviOption_boolUseGlobalPseudoTransparency);
+#ifdef COMPILE_INFO_TIPS
+	#ifdef COMPILE_TDE_SUPPORT
+		mergeTip(m_pUseTransparencyBoolSelector,
+			__tr2qs_ctx("<center>This option makes all KVIrc windows look " \
+				"transparent.<br>You must choose a blending " \
+				"background image to below or check the " \
+				"\"Use KDE desktop for transparency\" option.</center>","options"));
+	#else
+		mergeTip(m_pUseTransparencyBoolSelector,
+			__tr2qs_ctx("<center>This option makes all KVIrc windows look " \
+				"like transparent.<br>You must choose a blending " \
+				"background image to below.</center>","options"));
+	#endif
+#endif
+
+	KviUIntSelector * u = addUIntSelector(0,1,1,1,__tr2qs_ctx("Child window opacity:","options"),KviOption_uintGlobalTransparencyChildFadeFactor,
+							0,100,35,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
+	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+
+	u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Parent window opacity:","options"),KviOption_uintGlobalTransparencyParentFadeFactor,
+							0,100,10,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
+	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool)));
+
+	KviColorSelector * c = addColorSelector(0,3,1,3,__tr2qs_ctx("Blend color:","options"),KviOption_colorGlobalTransparencyFade,
+						KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
+	connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),c,TQT_SLOT(setEnabled(bool)));
+
+//	addRowSpacer(0,13,0,13);
+#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)));
+	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
+
+	m_pUpdateKdeBackgroundOnChangeBoolSelector = addBoolSelector(0,5,1,5,__tr2qs_ctx("Keep in sync with KDE background changes","options"),KviOption_boolUpdateKdeBackgroundOnChange,
+				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
+
+	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
+				KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde));
+	layout()->setRowStretch(6,1);
+	connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool)));
+
+#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_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
+	createLayout(1,1);
+	addRowSpacer(0,0,0,0);
+#endif
+}
+
+KviThemeTransparencyOptionsWidget::~KviThemeTransparencyOptionsWidget()
+{
+}
+
+void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(bool)
+{
+#ifdef COMPILE_PSEUDO_TRANSPARENCY
+	#ifdef COMPILE_TDE_SUPPORT
+		m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && !(m_pObtainBackgroundFromKdeBoolSelector->isChecked()));
+	#else
+		m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked());
+	#endif
+#endif
+}
+
+void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bool)
+{
+#ifdef COMPILE_PSEUDO_TRANSPARENCY
+	#ifdef COMPILE_TDE_SUPPORT
+		m_pUpdateKdeBackgroundOnChangeBoolSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && m_pObtainBackgroundFromKdeBoolSelector->isChecked());
+	#endif
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
+{
+	createLayout(7,1);
+
+	addColorSelector(0,0,0,0,__tr2qs_ctx("Active Background","options"),KviOption_colorMdiCaptionActive);
+	addColorSelector(0,1,0,1,__tr2qs_ctx("Inactive Background","options"),KviOption_colorMdiCaptionInactive);
+	addColorSelector(0,2,0,2,__tr2qs_ctx("Active Text (Primary)","options"),KviOption_colorCaptionTextActive);
+	addColorSelector(0,3,0,3,__tr2qs_ctx("Active Text (Secondary)","options"),KviOption_colorCaptionTextActive2);
+	addColorSelector(0,4,0,4,__tr2qs_ctx("Inactive Text (Primary)","options"),KviOption_colorCaptionTextInactive);
+	addColorSelector(0,5,0,5,__tr2qs_ctx("Inactive Text (Secondary)","options"),KviOption_colorCaptionTextInactive2);
+
+	addRowSpacer(0,6,0,6);
+}
+
+KviThemeMdiCaptionsOptionsWidget::~KviThemeMdiCaptionsOptionsWidget()
+{
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
+{
+	createLayout(2,1);
+
+	addColorSelector(0,0,0,0,__tr2qs_ctx("Background","options"),KviOption_colorMdiBackground);
+	addPixmapSelector(0,1,0,1,__tr2qs_ctx("Background Image","options"),KviOption_pixmapMdiBackground);
+
+	layout()->setRowStretch(1,1);
+}
+
+KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
+{
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
+{
+	createLayout(9,1);
+	
+	addFontSelector(0,0,0,0,__tr2qs_ctx("Font","options"),KviOption_fontIrcToolBarApplet);
+	
+	addColorSelector(0,1,0,1,__tr2qs_ctx("Background","options"),KviOption_colorIrcToolBarAppletBackground);
+	addColorSelector(0,2,0,2,__tr2qs_ctx("Low-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundLowContrast);
+	addColorSelector(0,3,0,3,__tr2qs_ctx("Mid-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundMidContrast);
+	addColorSelector(0,4,0,4,__tr2qs_ctx("Active High-Contrast Foreground (Primary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive1);
+	addColorSelector(0,5,0,5,__tr2qs_ctx("Active High-Contrast Foreground (Secondary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastActive2);
+	addColorSelector(0,6,0,6,__tr2qs_ctx("Inactive High-Contrast Foreground (Primary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive1);
+	addColorSelector(0,7,0,7,__tr2qs_ctx("Inactive High-Contrast Foreground (Secondary)","options"),KviOption_colorIrcToolBarAppletForegroundHighContrastInactive2);
+
+	addPixmapSelector(0,8,0,8,__tr2qs_ctx("Background Image","options"),KviOption_pixmapIrcToolBarAppletBackground);
+
+	layout()->setRowStretch(8,1);
+}
+
+KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget()
+{
+}
+
+
+#include "m_optw_interfacelootdeglobal.moc"
diff --git a/src/modules/options/optw_interfacelootdeglobal.h b/src/modules/options/optw_interfacelootdeglobal.h
new file mode 100644
index 00000000..0259873c
--- /dev/null
+++ b/src/modules/options/optw_interfacelootdeglobal.h
@@ -0,0 +1,118 @@
+#ifndef _OPTW_INTERFACELOOKGLOBAL_H_
+#define _OPTW_INTERFACELOOKGLOBAL_H_
+
+//
+//   File : optw_interfacelootdeglobal.h
+//   Creation date : Sun Jun 3 2001 20:49:02 CEST by Szymon Stefanek
+//
+//   This file is part of the KVirc irc client distribution
+//   Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)
+//
+//   This program is FREE software. You can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your opinion) any later version.
+//
+//   This program is distributed in the HOPE that it will be USEFUL,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//   See the GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, write to the Free Software Foundation,
+//   Inc. ,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
+
+#include "kvi_settings.h"
+#include "kvi_optionswidget.h"
+#include "kvi_selectors.h"
+
+
+#define KVI_OPTIONS_WIDGET_ICON_KviThemeGeneralOptionsWidget KVI_SMALLICON_GUI
+#define KVI_OPTIONS_WIDGET_NAME_KviThemeGeneralOptionsWidget __tr2qs_no_lookup("General")
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeGeneralOptionsWidget __tr2qs_no_lookup("theme")
+#define KVI_OPTIONS_WIDGET_GROUP_KviThemeGeneralOptionsWidget "theme"
+
+
+class KviThemeGeneralOptionsWidget : public KviOptionsWidget
+{
+	Q_OBJECT
+  
+public:
+	KviThemeGeneralOptionsWidget(TQWidget * parent);
+	~KviThemeGeneralOptionsWidget();
+};
+
+
+#define KVI_OPTIONS_WIDGET_ICON_KviThemeTransparencyOptionsWidget KVI_SMALLICON_TRANSPARENT
+#define KVI_OPTIONS_WIDGET_NAME_KviThemeTransparencyOptionsWidget __tr2qs_no_lookup("Transparency")
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeTransparencyOptionsWidget __tr2qs_no_lookup("theme,background")
+#define KVI_OPTIONS_WIDGET_GROUP_KviThemeTransparencyOptionsWidget "theme"
+
+
+class KviThemeTransparencyOptionsWidget : public KviOptionsWidget
+{
+	Q_OBJECT
+  
+public:
+	KviThemeTransparencyOptionsWidget(TQWidget * parent);
+	~KviThemeTransparencyOptionsWidget();
+protected:
+#ifdef COMPILE_PSEUDO_TRANSPARENCY
+	KviPixmapSelector * m_pGlobalBackgroundPixmapSelector;
+	KviBoolSelector * m_pUseTransparencyBoolSelector;
+	#ifdef COMPILE_TDE_SUPPORT
+		KviBoolSelector * m_pObtainBackgroundFromKdeBoolSelector;
+		KviBoolSelector * m_pUpdateKdeBackgroundOnChangeBoolSelector;
+	#endif
+#endif
+protected slots:
+	void enableGlobalBackgroundPixmapSelector(bool);
+	void enableUpdateKdeBackgroundBoolSelector(bool);
+};
+
+
+#define KVI_OPTIONS_WIDGET_ICON_KviThemeMdiCaptionsOptionsWidget KVI_SMALLICON_CAPTION
+#define KVI_OPTIONS_WIDGET_NAME_KviThemeMdiCaptionsOptionsWidget __tr2qs_no_lookup("Window Captions")
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget __tr2qs_no_lookup("theme,mdi")
+#define KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget "theme"
+
+class KviThemeMdiCaptionsOptionsWidget : public KviOptionsWidget
+{
+	Q_OBJECT
+  
+public:
+	KviThemeMdiCaptionsOptionsWidget(TQWidget * parent);
+	~KviThemeMdiCaptionsOptionsWidget();
+};
+
+#define KVI_OPTIONS_WIDGET_ICON_KviThemeMdiAreaOptionsWidget KVI_SMALLICON_APPLET
+#define KVI_OPTIONS_WIDGET_NAME_KviThemeMdiAreaOptionsWidget __tr2qs_no_lookup("Workspace")
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiAreaOptionsWidget __tr2qs_no_lookup("theme,mdi")
+#define KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiAreaOptionsWidget "theme"
+
+class KviThemeMdiAreaOptionsWidget : public KviOptionsWidget
+{
+	Q_OBJECT
+  
+public:
+	KviThemeMdiAreaOptionsWidget(TQWidget * parent);
+	~KviThemeMdiAreaOptionsWidget();
+};
+
+#define KVI_OPTIONS_WIDGET_ICON_KviThemeToolBarAppletsOptionsWidget KVI_SMALLICON_APPLET
+#define KVI_OPTIONS_WIDGET_NAME_KviThemeToolBarAppletsOptionsWidget __tr2qs_no_lookup("ToolBar Applets")
+#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeToolBarAppletsOptionsWidget __tr2qs_no_lookup("theme,toolbar")
+#define KVI_OPTIONS_WIDGET_GROUP_KviThemeToolBarAppletsOptionsWidget "theme"
+
+
+class KviThemeToolBarAppletsOptionsWidget : public KviOptionsWidget
+{
+	Q_OBJECT
+  
+public:
+	KviThemeToolBarAppletsOptionsWidget(TQWidget * parent);
+	~KviThemeToolBarAppletsOptionsWidget();
+};
+
+#endif //!_OPTW_INTERFACELOOKGLOBAL_H_
-- 
cgit v1.2.3

