aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/options/OptionsWidget_theme.cpp
diff options
context:
space:
mode:
authorGravatar un1versal2016-04-26 22:54:25 +0100
committerGravatar un1versal2016-04-27 04:10:24 +0100
commit163d8eec3b20d2d61eeec5f8b60642cf75046c0e (patch)
tree3b9f7dee82b7174b4343d311620c83c3be28b25b /src/modules/options/OptionsWidget_theme.cpp
parentOptionsWidget_theme: add percentage suffix to opacity spinboxes (diff)
downloadKVIrc-163d8eec3b20d2d61eeec5f8b60642cf75046c0e.tar.gz
KVIrc-163d8eec3b20d2d61eeec5f8b60642cf75046c0e.tar.bz2
KVIrc-163d8eec3b20d2d61eeec5f8b60642cf75046c0e.zip
OptionsWidget_theme: cleanup formatting + indenting
Diffstat (limited to 'src/modules/options/OptionsWidget_theme.cpp')
-rw-r--r--src/modules/options/OptionsWidget_theme.cpp33
1 files changed, 15 insertions, 18 deletions
diff --git a/src/modules/options/OptionsWidget_theme.cpp b/src/modules/options/OptionsWidget_theme.cpp
index 75755b947..7ac5c5e50 100644
--- a/src/modules/options/OptionsWidget_theme.cpp
+++ b/src/modules/options/OptionsWidget_theme.cpp
@@ -32,7 +32,6 @@
#include <QLayout>
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
OptionsWidget_theme::OptionsWidget_theme(QWidget * parent)
: KviOptionsWidget(parent)
@@ -44,7 +43,6 @@ OptionsWidget_theme::OptionsWidget_theme(QWidget * parent)
addBoolSelector(0,0,1,0,__tr2qs_ctx("Show icons in popup menus","options"),KviOption_boolShowIconsInPopupMenus);
KviFontSelector * f = addFontSelector(0,2,1,2,__tr2qs_ctx("Global application font:","options"),KviOption_fontApplication,
KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont));
-
connect(b,SIGNAL(toggled(bool)),f,SLOT(setEnabled(bool)));
addRowSpacer(0,3,1,3);
@@ -54,14 +52,11 @@ OptionsWidget_theme::~OptionsWidget_theme()
{
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * parent)
: KviOptionsWidget(parent)
{
#ifdef COMPILE_PSEUDO_TRANSPARENCY
-
createLayout();
KviUIntSelector * u = addUIntSelector(0,0,1,0,__tr2qs_ctx("Global window opacity:","options"),KviOption_uintGlobalWindowOpacityPercent,50,100,100, true);
@@ -87,13 +82,13 @@ OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * paren
"background image below.","options"));
#endif
- u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Child window opacity:","options"),KviOption_uintGlobalTransparencyChildFadeFactor,
- 0,100,35,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
+ u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Child window opacity:","options"),KviOption_uintGlobalTransparencyChildFadeFactor,0,100,35,
+ KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
u->setSuffix("%");
connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
- u = addUIntSelector(0,3,1,3,__tr2qs_ctx("Parent window opacity:","options"),KviOption_uintGlobalTransparencyParentFadeFactor,
- 0,100,10,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
+ u = addUIntSelector(0,3,1,3,__tr2qs_ctx("Parent window opacity:","options"),KviOption_uintGlobalTransparencyParentFadeFactor,0,100,10,
+ KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
u->setSuffix("%");
connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
@@ -102,9 +97,11 @@ OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * paren
connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),c,SLOT(setEnabled(bool)));
#ifdef COMPILE_X11_SUPPORT
- m_pUseCompositingForTransparencyBoolSelector = addBoolSelector(0,5,1,5,__tr2qs_ctx("Use compositing for real transparency","options"),KviOption_boolUseCompositingForTransparency, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
+ m_pUseCompositingForTransparencyBoolSelector = addBoolSelector(0,5,1,5,__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));
+ 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())
@@ -118,22 +115,25 @@ OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * paren
}
#elif defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
- m_pUseWindowsFakeDesktopTransparencyBoolSelector = addBoolSelector(0,5,1,5,__tr2qs_ctx("Use desktop background for transparency","options"),KviOption_boolUseWindowsDesktopForTransparency, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
+ m_pUseWindowsFakeDesktopTransparencyBoolSelector = addBoolSelector(0,5,1,5,__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));
+ 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);
connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),m_pUseWindowsFakeDesktopTransparencyBoolSelector,SLOT(setEnabled(bool)));
connect(m_pUseWindowsFakeDesktopTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool)));
-
#else
- m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,5,1,5,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
+ m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,5,1,5,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground,
+ KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency));
layout()->setRowStretch(5,1);
#endif //!COMPILE_X11_SUPPORT
connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool)));
#else //!COMPILE_PSEUDO_TRANSPARENCY
createLayout();
+
addRowSpacer(0,0,0,0);
#endif
}
@@ -156,9 +156,6 @@ void OptionsWidget_themeTransparency::enableGlobalBackgroundPixmapSelector(bool)
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
OptionsWidget_themeToolBarApplets::OptionsWidget_themeToolBarApplets(QWidget * parent)
: KviOptionsWidget(parent)
{