summaryrefslogtreecommitdiffstats
path: root/kicker/taskbar/taskbar.kcfg
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-10-28 14:06:47 -0500
committerTimothy Pearson <[email protected]>2013-10-28 14:06:47 -0500
commit740cdbc24975f0469962aea07732dddf6aee5b78 (patch)
tree52da2c654a5b0cc041f162d6d4f81e3ff886902b /kicker/taskbar/taskbar.kcfg
parenta039120e05fd8c03569e1135a30bbbb797e887b2 (diff)
parentd1324133ee949acedcbf1776c8a80d3e28218c23 (diff)
downloadtdebase-740cdbc24975f0469962aea07732dddf6aee5b78.tar.gz
tdebase-740cdbc24975f0469962aea07732dddf6aee5b78.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kicker/taskbar/taskbar.kcfg')
-rw-r--r--kicker/taskbar/taskbar.kcfg21
1 files changed, 16 insertions, 5 deletions
diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg
index 320b8a2d6..95596ad34 100644
--- a/kicker/taskbar/taskbar.kcfg
+++ b/kicker/taskbar/taskbar.kcfg
@@ -31,6 +31,22 @@
<label>Show only minimized windows</label>
<whatsthis>Select this option if you want the taskbar to display <b>only</b> minimized windows. By default, this option is not selected and the taskbar will show all windows.</whatsthis>
</entry>
+ <entry key="DisplayIconsNText" type="Enum" >
+ <choices>
+ <choice name="DisplayIconsAndText">
+ <label>Never</label>
+ </choice>
+ <choice name="DisplayTextOnly">
+ <label>When Taskbar Full</label>
+ </choice>
+ <choice name="DisplayIconsOnly">
+ <label>Always</label>
+ </choice>
+ </choices>
+ <default>DisplayIconsAndText</default>
+ <label>Display:</label>
+ <whatsthis>Choose taskbar display mode among <strong>Icons and text</strong>, <strong>Text only</strong> and <strong>Icons only</strong></whatsthis>
+ </entry>
<entry key="GroupTasks" type="Enum" >
<choices>
<choice name="GroupNever">
@@ -73,11 +89,6 @@
<label>Sort windows by application</label>
<whatsthis>Selecting this option causes the taskbar to show windows ordered by application. By default this option is selected.</whatsthis>
</entry>
- <entry key="ShowIcon" type="Bool" >
- <default>true</default>
- <label>Show application icons</label>
- <whatsthis>Select this option if you want window icons to appear along with their titles in the taskbar. By default this option is selected.</whatsthis>
- </entry>
<entry key="MaximumButtonWidth" type="Int" >
<default>200</default>
<min>0</min>