diff options
| author | Timothy Pearson <[email protected]> | 2013-04-10 16:55:58 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-04-10 16:55:58 -0500 |
| commit | 137c3446f89fe808518981f974714161f794b364 (patch) | |
| tree | c2510cece63d90384375b1daf0b708fb7b23169e /kcontrol/taskbar/kcmtaskbarui.ui | |
| parent | 4dc80faf840ee48bd4c0b8d5338a5274de013c39 (diff) | |
| download | tdebase-137c3446f89fe808518981f974714161f794b364.tar.gz tdebase-137c3446f89fe808518981f974714161f794b364.zip | |
Overhaul taskbar configuration system
This resolves Bug 1399
Diffstat (limited to 'kcontrol/taskbar/kcmtaskbarui.ui')
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbarui.ui | 82 |
1 files changed, 52 insertions, 30 deletions
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui index a522ef683..871badd75 100644 --- a/kcontrol/taskbar/kcmtaskbarui.ui +++ b/kcontrol/taskbar/kcmtaskbarui.ui @@ -24,6 +24,57 @@ <property name="margin"> <number>0</number> </property> + <widget class="TQGroupBox"> + <property name="name"> + <cstring>GroupBox2</cstring> + </property> + <property name="title"> + <string>Settings</string> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>globalConfigWarning</cstring> + </property> + <property name="text"> + <string><b>NOTE: This module is currently editing the global floating taskbar configuration.</b><br>To change the configuration of a specific Kicker taskbar applet, please use the corresponding Configure Taskbar menu option.</string> + </property> + </widget> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_UseGlobalSettings</cstring> + </property> + <property name="text"> + <string>Use global floating taskbar configuration</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="whatsThis" stdset="0"> + <string>Selecting this option causes the taskbar to use the global taskbar configuration.</string> + </property> + </widget> + <widget class="TQPushButton" row="1" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>globalConfigReload</cstring> + </property> + <property name="text"> + <string>Overwrite current configuration with the current global floating taskbar configuration</string> + </property> + </widget> + <widget class="TQPushButton" row="2" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>globalConfigEdit</cstring> + </property> + <property name="text"> + <string>Edt global floating taskbar configuration</string> + </property> + </widget> + </grid> + </widget> <widget class="TQButtonGroup"> <property name="name"> <cstring>taskbarGroup</cstring> @@ -379,7 +430,7 @@ By default, this option is selected and all windows are shown.</string> </widget> <widget class="TQGroupBox"> <property name="name"> - <cstring>GroupBox1</cstring> + <cstring>actionsGroup</cstring> </property> <property name="title"> <string>Actions</string> @@ -462,35 +513,6 @@ By default, this option is selected and all windows are shown.</string> </widget> </grid> </widget> - <widget class="TQGroupBox"> - <property name="name"> - <cstring>GroupBox2</cstring> - </property> - <property name="title"> - <string>Settings</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <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> - </widget> - <widget class="TQPushButton" rowspan="1" colspan="2"> - <property name="name"> - <cstring>globalConfigReload</cstring> - </property> - <property name="text"> - <string>Use current global floating taskbar configuration</string> - </property> - </widget> - </grid> - </widget> <spacer> <property name="name"> <cstring>Spacer1</cstring> |