summaryrefslogtreecommitdiffstats
path: root/twin/kcmtwin/twinoptions/windows.h
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2014-11-20 11:05:41 +0900
committerMichele Calgaro <[email protected]>2014-11-20 11:05:41 +0900
commit46acebe4a0a93375e76c9a98481d03b64adfe357 (patch)
tree4f1be720b4c799827abf16f94e32e74242106106 /twin/kcmtwin/twinoptions/windows.h
parenta1125663869f976934e166f6612d235826a2fd51 (diff)
parent154df4875e51f83f64b4c3f431867de79c1707fb (diff)
downloadtdebase-46acebe4a0a93375e76c9a98481d03b64adfe357.tar.gz
tdebase-46acebe4a0a93375e76c9a98481d03b64adfe357.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'twin/kcmtwin/twinoptions/windows.h')
-rw-r--r--twin/kcmtwin/twinoptions/windows.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/twin/kcmtwin/twinoptions/windows.h b/twin/kcmtwin/twinoptions/windows.h
index 27ea02a8d..facde4136 100644
--- a/twin/kcmtwin/twinoptions/windows.h
+++ b/twin/kcmtwin/twinoptions/windows.h
@@ -3,6 +3,7 @@
*
* Copyright (c) 1997 Patrick Dowler [email protected]
* Copyright (c) 2001 Waldo Bastian [email protected]
+ * Copyright (c) 2011-2014 Timothy Pearson <[email protected]>
*
* 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
@@ -259,10 +260,14 @@ private:
TQCheckBox *keepAboveAsActive;
TQCheckBox *disableARGB;
TQCheckBox *useOpenGL;
+ TQCheckBox *blurBackground;
TQCheckBox *fadeInWindows;
TQCheckBox *fadeInMenuWindows;
+ TQCheckBox *fadeInToolTipWindows;
TQCheckBox *fadeOnOpacityChange;
TQCheckBox *useShadows;
+ TQCheckBox *useShadowsOnMenuWindows;
+ TQCheckBox *useShadowsOnToolTipWindows;
TQCheckBox *removeShadowsOnResize;
TQCheckBox *removeShadowsOnMove;
TQGroupBox *sGroup;
@@ -283,7 +288,7 @@ private:
KIntNumInput *fadeOutSpeed;
KColorButton *shadowColor;
TDEConfig *config;
- bool standAlone;
+ bool standAlone;
bool alphaActivated;
bool resetKompmgr_;
bool kompmgrAvailable();
@@ -295,6 +300,7 @@ private:
private slots:
void resetKompmgr();
void showWarning(bool alphaActivated);
+ void processShadowLockouts();
};
#endif