diff options
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbar.cpp | 3 | ||||
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbarui.ui | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 5bdab1e92..bd98ee3f9 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -172,6 +172,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL connect(m_widget->globalConfigReload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadConfigurationFromGlobals())); connect(m_widget->globalConfigEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditGlobalConfiguration())); connect(m_widget->kcfg_UseGlobalSettings, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); + connect(m_widget->kcfg_SortByApp, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); TQFile configFile(locateLocal("config", m_configFileName)); if (!configFile.exists()) @@ -298,6 +299,8 @@ void TaskbarConfig::processLockouts() m_widget->globalConfigEdit->hide(); } } + + m_widget->kcfg_AllowDragAndDropReArrange->setEnabled(!m_widget->kcfg_SortByApp->isChecked()); } void TaskbarConfig::slotReloadConfigurationFromGlobals() diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui index 1f34c32e4..4d655b2a7 100644 --- a/kcontrol/taskbar/kcmtaskbarui.ui +++ b/kcontrol/taskbar/kcmtaskbarui.ui @@ -70,7 +70,7 @@ <cstring>globalConfigReload</cstring> </property> <property name="text"> - <string>Overwrite current configuration with the current global taskbar configuration</string> + <string>Overwrite current configuration with the current global floating taskbar configuration</string> </property> </widget> <widget class="TQPushButton" row="3" column="0" rowspan="1" colspan="2"> @@ -78,7 +78,7 @@ <cstring>globalConfigEdit</cstring> </property> <property name="text"> - <string>Edit global taskbar configuration</string> + <string>Edt global floating taskbar configuration</string> </property> </widget> </grid> @@ -130,7 +130,7 @@ By default this option is selected.</string> By default, this option is selected and all windows are shown.</string> </property> </widget> - <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_AllowDragAndDropReArrange</cstring> </property> @@ -144,7 +144,7 @@ By default, this option is selected and all windows are shown.</string> <string>Turning this option on will allow tasks on the taskbar to be manually rearranged using drag and drop.</string> </property> </widget> - <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ShowWindowListBtn</cstring> </property> @@ -216,7 +216,7 @@ By default the taskbar groups windows when it is full.</string> <cstring>kcfg_ShowTaskStates</cstring> </property> </widget> - <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ShowOnlyIconified</cstring> </property> @@ -229,7 +229,7 @@ By default the taskbar groups windows when it is full.</string> By default, this option is not selected and the taskbar will show all windows.</string> </property> </widget> - <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ShowIcon</cstring> </property> @@ -437,7 +437,7 @@ By default, this option is selected and all windows are shown.</string> <bool>true</bool> </property> </widget> - <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_CycleWheel</cstring> </property> |