Avoid the use of a direct X call to get an ARGB visual; use Qt::WA_TranslucentBackground instead.

This way we can use a QApplication() ctor without the Display* parameter, gaining:
1) more respect from kde, that will stop calling us a "Qt-subapplication"
2) compositing portability (still to be tested)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3933 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 15 insertions, 24 deletions

diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 6e08dc8bb..dd69cecc8 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -96,35 +96,26 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * p
 			KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
 	connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),c,SLOT(setEnabled(bool)));
 
-        #ifdef COMPILE_X11_SUPPORT
-                m_pUseCompositingForTransparencyBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use compositing for real transparency","options"),KviOption_boolUseCompositingForTransparency, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
 
-                m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency));
-                layout()->setRowStretch(6,1);
+	m_pUseCompositingForTransparencyBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use compositing for real transparency","options"),KviOption_boolUseCompositingForTransparency, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
 
-                if(g_pApp->supportsCompositing())
-                {
-                        connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),m_pUseCompositingForTransparencyBoolSelector,SLOT(setEnabled(bool)));
-                        connect(m_pUseCompositingForTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool)));
-                } else {
-                        m_pUseCompositingForTransparencyBoolSelector->setEnabled(false);
-                        m_pUseCompositingForTransparencyBoolSelector->setChecked(false);
-                        enableGlobalBackgroundPixmapSelector(true);
-                }
+	m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency));
+	layout()->setRowStretch(6,1);
 
-        #elif defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-		m_pUseWindowsFakeDesktopTransparencyBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use desktop background for transparency","options"),KviOption_boolUseWindowsDesktopForTransparency, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
-
-                m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency));
-                layout()->setRowStretch(6,1);
+	if(g_pApp->supportsCompositing())
+	{
+		connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),m_pUseCompositingForTransparencyBoolSelector,SLOT(setEnabled(bool)));
+		connect(m_pUseCompositingForTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool)));
+	} else {
+		m_pUseCompositingForTransparencyBoolSelector->setEnabled(false);
+		m_pUseCompositingForTransparencyBoolSelector->setChecked(false);
+		enableGlobalBackgroundPixmapSelector(true);
+	}
 
-                connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),m_pUseWindowsFakeDesktopTransparencyBoolSelector,SLOT(setEnabled(bool)));
+        #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
+		m_pUseWindowsFakeDesktopTransparencyBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use desktop background for transparency","options"),KviOption_boolUseWindowsDesktopForTransparency, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
                 connect(m_pUseWindowsFakeDesktopTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool)));
-
-        #else
-                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_X11_SUPPORT
+        #endif
 	connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool)));
 #else //!COMPILE_PSEUDO_TRANSPARENCY
 	createLayout();