diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-01-06 15:44:22 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-01-06 15:44:22 -0600 |
| commit | 3642a26c369228341bc7abf55341eb1d6d4d6dfa (patch) | |
| tree | 1ab102939f160e204c237f19af47e362ad31785b /kcontrol/taskbar/kcmtaskbarui.ui | |
| parent | 39c9f76c1b1bf4d2db41a217c301d1f260332697 (diff) | |
| parent | ce3da132361e281919a222a519ff9901c8d6c3e1 (diff) | |
| download | tdebase-3642a26c369228341bc7abf55341eb1d6d4d6dfa.tar.gz tdebase-3642a26c369228341bc7abf55341eb1d6d4d6dfa.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/taskbar/kcmtaskbarui.ui')
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbarui.ui | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui index dd0aadb9d..6a43b5fbb 100644 --- a/kcontrol/taskbar/kcmtaskbarui.ui +++ b/kcontrol/taskbar/kcmtaskbarui.ui @@ -462,6 +462,17 @@ By default, this option is selected and all windows are shown.</string> </widget> </grid> </widget> + <widget class="TQLabel" rowspan="1" colspan="2"> + <property name="name"> + <cstring>globalConfigWarning</cstring> + </property> + <property name="text"> + <string>NOTE: This module is currently editing the global floating taskbar configuration.<br>To change the configuration of a specific Kicker taskbar applet, please use the Configure Taskbar menu option.</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_ShowTaskStates</cstring> + </property> + </widget> <spacer> <property name="name"> <cstring>Spacer1</cstring> |