diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-12-26 13:35:30 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-12-26 13:35:30 -0600 |
| commit | 4d3d2420430fb53000ceda25ae7498e49f6e94b2 (patch) | |
| tree | f350afc9cba3f615fa3c982b73e57b2272fa8a47 /kicker/taskbar/taskbar.h | |
| parent | f5c55ca4ce9587598ce81399c2196c876ec55942 (diff) | |
| parent | 0ef12d60c85f58af9052d83ce1945d71afe16cb4 (diff) | |
| download | tdebase-4d3d2420430fb53000ceda25ae7498e49f6e94b2.tar.gz tdebase-4d3d2420430fb53000ceda25ae7498e49f6e94b2.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kicker/taskbar/taskbar.h')
| -rw-r--r-- | kicker/taskbar/taskbar.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index bb4167166..dc75fab9c 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -110,13 +110,14 @@ private: bool blocklayout; bool m_showAllWindows; - bool m_cycleWheel; + bool m_cycleWheel; // The screen to show, -1 for all screens int m_currentScreen; bool m_showOnlyCurrentScreen; bool m_sortByDesktop; bool m_showIcon; bool m_showOnlyIconified; + int m_showTaskStates; ArrowType arrowType; TaskContainer::List containers; TaskContainer::List m_hiddenContainers; @@ -127,10 +128,10 @@ private: bool isGrouping; void reGroup(); KGlobalAccel* keys; - KTextShadowEngine* m_textShadowEngine; - TQTimer m_relayoutTimer; - bool m_ignoreUpdates; - TQImage m_blendGradient; + KTextShadowEngine* m_textShadowEngine; + bool m_ignoreUpdates; + TQTimer m_relayoutTimer; + TQImage m_blendGradient; }; #endif |