diff options
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbar.cpp | 34 | ||||
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbar.h | 1 | ||||
| -rw-r--r-- | kcontrol/taskbar/kcmtaskbarui.ui | 1507 | ||||
| -rw-r--r-- | kicker/taskbar/taskbar.kcfg | 7 |
4 files changed, 1033 insertions, 516 deletions
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 941c8b986..f2997a331 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -24,6 +24,7 @@ #include <tqfile.h> #include <tqlabel.h> #include <tqbuttongroup.h> +#include <tqtabwidget.h> #include <dcopclient.h> @@ -218,6 +219,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL { m_widget->appearance->insertItem((*it).name()); } + m_widget->appearance->insertItem(i18n("Custom")); connect(m_widget->appearance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(appearanceChanged(int))); @@ -247,7 +249,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL { m_widget->kcfg_ShowAllWindows->hide(); m_widget->kcfg_SortByDesktop->hide(); - m_widget->spacer2->changeSize(0, 0); + // m_widget->spacer2->changeSize(0, 0); } if (!TQApplication::desktop()->isVirtualDesktop() || @@ -306,14 +308,12 @@ void TaskbarConfig::processLockouts() m_widget->localConfigWarning->show(); m_widget->kcfg_UseGlobalSettings->show(); if (m_widget->kcfg_UseGlobalSettings->isChecked()) { - m_widget->taskbarGroup->hide(); - m_widget->actionsGroup->hide(); + m_widget->tabs->hide(); m_widget->globalConfigReload->hide(); m_widget->globalConfigEdit->show(); } else { - m_widget->taskbarGroup->show(); - m_widget->actionsGroup->show(); + m_widget->tabs->show(); // FIXME // Disable this feature until a method can be found to force the TDECModule to reload its settings from disk after the global settings have been copied! //m_widget->globalConfigReload->show(); @@ -384,23 +384,37 @@ void TaskbarConfig::updateAppearanceCombo() if (i < m_appearances.count()) { m_widget->appearance->setCurrentItem(i); + m_widget->customAppearance->setEnabled(false); return; } - if (m_widget->appearance->count() == (int)m_appearances.count()) + else if (m_widget->appearance->count() == (int)m_appearances.count()) { - m_widget->appearance->insertItem(i18n("Custom")); + m_widget->customAppearance->setEnabled(true); } m_widget->appearance->setCurrentItem(m_appearances.count()); } +void TaskbarConfig::updateCustomAppearance() +{ + m_widget->kcfg_DrawButtons ->setChecked(m_settingsObject->drawButtons()); + m_widget->kcfg_HaloText ->setChecked(m_settingsObject->haloText()); + m_widget->kcfg_ShowButtonOnHover->setChecked(m_settingsObject->showButtonOnHover()); +} + void TaskbarConfig::appearanceChanged(int selected) { - if (selected < (int)m_appearances.count()) + if (selected < m_appearances.count()) { + m_widget->customAppearance->setEnabled(false); unmanagedWidgetChangeState(!m_appearances[selected].matchesSettings()); } + else if(selected == m_appearances.count()) + { + m_widget->customAppearance->setEnabled(true); + updateCustomAppearance(); + } } void TaskbarConfig::load() @@ -413,6 +427,8 @@ void TaskbarConfig::load() void TaskbarConfig::save() { + TDECModule::save(); + m_settingsObject->setShowCurrentScreenOnly(!m_widget->showAllScreens->isChecked()); int selectedAppearance = m_widget->appearance->currentItem(); if (selectedAppearance < (int)m_appearances.count()) @@ -421,8 +437,6 @@ void TaskbarConfig::save() m_settingsObject->writeConfig(); } - TDECModule::save(); - TQByteArray data; kapp->dcopClient()->emitDCOPSignal("kdeTaskBarConfigChanged()", data); } diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h index 4d644bd0f..68fb91e12 100644 --- a/kcontrol/taskbar/kcmtaskbar.h +++ b/kcontrol/taskbar/kcmtaskbar.h @@ -78,6 +78,7 @@ private slots: private: TaskbarAppearance::List m_appearances; void updateAppearanceCombo(); + void updateCustomAppearance(); static const TQStringList& actionList(); static TQStringList i18nActionList(); static const TQStringList& groupModeList(); diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui index f5c36e2b2..5723c76d7 100644 --- a/kcontrol/taskbar/kcmtaskbarui.ui +++ b/kcontrol/taskbar/kcmtaskbarui.ui @@ -8,8 +8,8 @@ <rect> <x>0</x> <y>0</y> - <width>358</width> - <height>351</height> + <width>813</width> + <height>616</height> </rect> </property> <property name="caption"> @@ -22,581 +22,1082 @@ <cstring>unnamed</cstring> </property> <property name="margin"> - <number>0</number> + <number>5</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: Currently you are editing the global taskbar configuration.</b><br>To change the configuration of a specific taskbar (when using multiple taskbars), use the corresponding Configure Taskbar menu option, located in the taskbar handle popup menu.</string> - </property> - </widget> - <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>localConfigWarning</cstring> - </property> - <property name="text"> - <string><b>NOTE:</b> Currently you are editing the taskbar configuration for <b>only</b> this taskbar.</string> - </property> - </widget> - <widget class="TQCheckBox" row="1" 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="2" 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="3" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>globalConfigEdit</cstring> - </property> - <property name="text"> - <string>Edit global floating taskbar configuration</string> - </property> - </widget> - </grid> - </widget> - <widget class="TQButtonGroup"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>taskbarGroup</cstring> + <cstring>layout8</cstring> </property> - <property name="title"> - <string>Taskbar</string> - </property> - <property name="layoutMargin" stdset="0"> - </property> - <property name="layoutSpacing" stdset="0"> - </property> - <grid> + <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel"> <property name="name"> - <cstring>kcfg_ShowAllWindows</cstring> + <cstring>localConfigWarning</cstring> </property> <property name="text"> - <string>&Show windows from all desktops</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - <property name="whatsThis" stdset="0"> - <string>Turning this option off will cause the taskbar to display <b>only</b> the windows on the current desktop. - -By default, this option is selected and all windows are shown.</string> + <string><b>NOTE:</b> Currently you are editing the taskbar configuration for <b>only</b> this taskbar.</string> </property> </widget> - <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel"> <property name="name"> - <cstring>kcfg_SortByDesktop</cstring> + <cstring>globalConfigWarning</cstring> </property> <property name="text"> - <string>Sort windows by desk&top</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - <property name="whatsThis" stdset="0"> - <string>Selecting this option causes the taskbar to show windows in order of the desktop they appear on. - -By default this option is selected.</string> + <string><b>NOTE: Currently you are editing the global taskbar configuration.</b><br>To change the configuration of a specific taskbar (when using multiple taskbars), use the corresponding Configure Taskbar menu option, located in the taskbar handle popup menu.</string> </property> </widget> - <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox"> <property name="name"> - <cstring>showAllScreens</cstring> + <cstring>kcfg_UseGlobalSettings</cstring> </property> <property name="text"> - <string>Show windows from all sc&reens</string> + <string>Use global floating taskbar configuration</string> </property> <property name="checked"> <bool>true</bool> </property> <property name="whatsThis" stdset="0"> - <string>Turning this option off will cause the taskbar to display <b>only</b> windows which are on the same Xinerama screen as the taskbar. - -By default, this option is selected and all windows are shown.</string> + <string>Selecting this option causes the taskbar to use the global taskbar configuration.</string> </property> </widget> - <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton"> <property name="name"> - <cstring>kcfg_SortByApp</cstring> + <cstring>globalConfigReload</cstring> </property> <property name="text"> - <string>Sort alphabeticall&y by application name</string> - </property> - <property name="checked"> - <bool>true</bool> + <string>Overwrite current configuration with the current global floating taskbar configuration</string> </property> </widget> - <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQPushButton"> <property name="name"> - <cstring>kcfg_AllowDragAndDropReArrange</cstring> + <cstring>globalConfigEdit</cstring> </property> <property name="text"> - <string>&Allow taskbar items to be rearranged using drag and drop</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - <property name="whatsThis" stdset="0"> - <string>Turning this option on will allow tasks on the taskbar to be manually rearranged using drag and drop.</string> + <string>Edit global floating taskbar configuration</string> </property> </widget> - <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3"> - <property name="name"> - <cstring>kcfg_CycleWheel</cstring> - </property> - <property name="text"> - <string>Cycle through windows with mouse wheel</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> + </vbox> + </widget> + <widget class="TQTabWidget"> + <property name="name"> + <cstring>tabs</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>3</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <widget class="TQWidget"> + <property name="name"> + <cstring>tab</cstring> + </property> + <attribute name="title"> + <string>&Tasks</string> + </attribute> + <vbox> <property name="name"> - <cstring>kcfg_ShowOnlyIconified</cstring> - </property> - <property name="text"> - <string>Show o&nly minimized windows</string> + <cstring>unnamed</cstring> </property> - <property name="whatsThis" stdset="0"> - <string>Select this option if you want the taskbar to display <b>only</b> minimized windows. + <widget class="TQButtonGroup"> + <property name="name"> + <cstring>grpDisplay</cstring> + </property> + <property name="title"> + <string>Display</string> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>kcfg_ShowAllWindows</cstring> + </property> + <property name="text"> + <string>&Show windows from all desktops</string> + </property> + <property name="accel"> + <string>Alt+S</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="whatsThis" stdset="0"> + <string>Turning this option off will cause the taskbar to display <b>only</b> the windows on the current desktop. + +By default, this option is selected and all windows are shown.</string> + </property> + </widget> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>kcfg_ShowOnlyIconified</cstring> + </property> + <property name="text"> + <string>Show o&nly minimized windows</string> + </property> + <property name="accel"> + <string>Alt+N</string> + </property> + <property name="whatsThis" stdset="0"> + <string>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.</string> - </property> - </widget> - <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3"> - <property name="name"> - <cstring>kcfg_ShowWindowListBtn</cstring> - </property> - <property name="text"> - <string>Show window list &button</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - <property name="whatsThis" stdset="0"> - <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string> - </property> - </widget> - <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>displayIconsNText</cstring> - </property> - <property name="text"> - <string>Dis&play:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>kcfg_DisplayIconsNText</cstring> - </property> - </widget> - <widget class="TQComboBox" row="8" column="2"> - <property name="name"> - <cstring>kcfg_DisplayIconsNText</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="whatsThis" stdset="0"> - <string>Choose taskbar display mode among <strong>Icons and text</strong>, <strong>Text only</strong> and <strong>Icons only</strong>.</string> - </property> - </widget> - <widget class="TQComboBox" row="9" column="2"> - <property name="name"> - <cstring>kcfg_GroupTasks</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="whatsThis" stdset="0"> - <string>The taskbar can group similar windows into single buttons. When one of these window group buttons are clicked on a menu appears showing all the windows in that group. This can be especially useful with the <em>Show all windows</em> option. + </property> + </widget> + <widget class="KSeparator" row="3" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>kSeparator5</cstring> + </property> + </widget> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>showAllScreens</cstring> + </property> + <property name="text"> + <string>Show windows from all sc&reens</string> + </property> + <property name="accel"> + <string>Alt+R</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="whatsThis" stdset="0"> + <string>Turning this option off will cause the taskbar to display <b>only</b> windows which are on the same Xinerama screen as the taskbar. + +By default, this option is selected and all windows are shown.</string> + </property> + </widget> + <widget class="TQComboBox" row="4" column="1" rowspan="2" colspan="1"> + <property name="name"> + <cstring>kcfg_ShowTaskStates</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>250</width> + <height>0</height> + </size> + </property> + <property name="whatsThis" stdset="0"> + <string>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</string> + </property> + </widget> + <widget class="TQLabel" row="4" column="0" rowspan="2" colspan="1"> + <property name="name"> + <cstring>showTaskStatesLabel</cstring> + </property> + <property name="minimumSize"> + <size> + <width>250</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string>&Show tasks with state:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_ShowTaskStates</cstring> + </property> + </widget> + <spacer row="5" column="2"> + <property name="name"> + <cstring>spacer23</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>31</width> + <height>20</height> + </size> + </property> + </spacer> + </grid> + </widget> + <widget class="TQButtonGroup"> + <property name="name"> + <cstring>grpSortGroup</cstring> + </property> + <property name="title"> + <string>Sorting and grouping</string> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <spacer row="1" column="0"> + <property name="name"> + <cstring>spacer2_2</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Fixed</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="3"> + <property name="name"> + <cstring>kcfg_AllowDragAndDropReArrange</cstring> + </property> + <property name="text"> + <string>&Allow taskbar items to be rearranged using drag and drop</string> + </property> + <property name="accel"> + <string>Alt+A</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="whatsThis" stdset="0"> + <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="0" column="0" rowspan="1" colspan="4"> + <property name="name"> + <cstring>kcfg_SortByApp</cstring> + </property> + <property name="text"> + <string>Sort alphabeticall&y by application name</string> + </property> + <property name="accel"> + <string>Alt+Y</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="4"> + <property name="name"> + <cstring>kcfg_SortByDesktop</cstring> + </property> + <property name="text"> + <string>Sort windows by desk&top</string> + </property> + <property name="accel"> + <string>Alt+T</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="whatsThis" stdset="0"> + <string>Selecting this option causes the taskbar to show windows in order of the desktop they appear on. + +By default this option is selected.</string> + </property> + </widget> + <widget class="KSeparator" row="3" column="0" rowspan="1" colspan="4"> + <property name="name"> + <cstring>kSeparator6</cstring> + </property> + </widget> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>groupTasksLabel</cstring> + </property> + <property name="minimumSize"> + <size> + <width>250</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string>&Group similar tasks:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_GroupTasks</cstring> + </property> + </widget> + <widget class="TQComboBox" row="4" column="2"> + <property name="name"> + <cstring>kcfg_GroupTasks</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>300</width> + <height>0</height> + </size> + </property> + <property name="whatsThis" stdset="0"> + <string>The taskbar can group similar windows into single buttons. When one of these window group buttons are clicked on a menu appears showing all the windows in that group. This can be especially useful with the <em>Show all windows</em> option. You can set the taskbar to <strong>Never</strong> group windows, to <strong>Always</strong> group windows or to group windows only <strong>When the Taskbar is Full</strong>. By default the taskbar groups windows when it is full.</string> - </property> - </widget> - <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>groupTasksLabel</cstring> - </property> - <property name="text"> - <string>&Group similar tasks:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>kcfg_GroupTasks</cstring> - </property> - </widget> - <widget class="TQComboBox" row="10" column="2"> - <property name="name"> - <cstring>kcfg_ShowTaskStates</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="whatsThis" stdset="0"> - <string>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</string> - </property> - </widget> - <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>showTaskStatesLabel</cstring> - </property> - <property name="text"> - <string>&Show tasks with state:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>kcfg_ShowTaskStates</cstring> - </property> - </widget> - <widget class="TQComboBox" row="11" column="2"> - <property name="name"> - <cstring>appearance</cstring> - </property> - </widget> - <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>textLabel1</cstring> - </property> - <property name="text"> - <string>A&ppearance:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>appearance</cstring> - </property> - </widget> - <widget class="TQCheckBox" row="12" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>kcfg_UseCustomColors</cstring> - </property> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>Use &custom colors</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - <widget class="TQLayoutWidget" row="13" column="0" rowspan="1" colspan="3"> + </property> + </widget> + <spacer row="4" column="3"> + <property name="name"> + <cstring>spacer23_2</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>31</width> + <height>20</height> + </size> + </property> + </spacer> + </grid> + </widget> + <spacer> + <property name="name"> + <cstring>spacer16</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Minimum</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </vbox> + </widget> + <widget class="TQWidget"> + <property name="name"> + <cstring>TabPage</cstring> + </property> + <attribute name="title"> + <string>&Appearance</string> + </attribute> + <grid> <property name="name"> - <cstring>layout9</cstring> + <cstring>unnamed</cstring> </property> - <grid> + <spacer row="2" column="1"> <property name="name"> - <cstring>unnamed</cstring> + <cstring>spacer21</cstring> </property> - <widget class="TQLabel" row="0" column="0"> - <property name="name"> - <cstring>inactiveTaskTextColorLabel</cstring> - </property> - <property name="text"> - <string>Inacti&ve task text color:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>kcfg_InactiveTaskTextColor</cstring> - </property> - </widget> - <widget class="KColorButton" row="0" column="1"> - <property name="name"> - <cstring>kcfg_InactiveTaskTextColor</cstring> - </property> - <property name="text"> - <string></string> - </property> - </widget> - <spacer row="0" column="2"> - <property name="name"> - <cstring>spacer11</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>191</width> - <height>20</height> - </size> - </property> - </spacer> - <widget class="TQLabel" row="0" column="3"> - <property name="name"> - <cstring>activeTaskTextColorLabel</cstring> - </property> - <property name="text"> - <string>Active task te&xt color:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>kcfg_ActiveTaskTextColor</cstring> - </property> - </widget> - <widget class="KColorButton" row="0" column="4"> - <property name="name"> - <cstring>kcfg_ActiveTaskTextColor</cstring> - </property> - <property name="text"> - <string></string> - </property> - </widget> - <spacer row="0" column="5"> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Minimum</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + <widget class="TQButtonGroup" row="0" column="1"> + <property name="name"> + <cstring>grpTaskbarColors</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>3</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Colors</string> + </property> + <grid> <property name="name"> - <cstring>spacer11_2</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>191</width> - <height>20</height> - </size> + <cstring>unnamed</cstring> </property> - </spacer> - <widget class="TQLabel" row="0" column="6"> + <spacer row="2" column="0"> + <property name="name"> + <cstring>spacer2_2_2</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Fixed</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>kcfg_UseCustomColors</cstring> + </property> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="text"> + <string>Use &custom colors</string> + </property> + <property name="accel"> + <string>Alt+C</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + <widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2"> + <property name="name"> + <cstring>layout19</cstring> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="TQLabel" row="1" column="0"> + <property name="name"> + <cstring>activeTaskTextColorLabel</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Active task te&xt color:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_ActiveTaskTextColor</cstring> + </property> + </widget> + <widget class="TQLabel" row="2" column="0"> + <property name="name"> + <cstring>taskBackgroundColorLabel</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>&Background color:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_TaskBackgroundColor</cstring> + </property> + </widget> + <widget class="KColorButton" row="0" column="1"> + <property name="name"> + <cstring>kcfg_InactiveTaskTextColor</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + <widget class="KColorButton" row="1" column="1"> + <property name="name"> + <cstring>kcfg_ActiveTaskTextColor</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + <widget class="KColorButton" row="2" column="1"> + <property name="name"> + <cstring>kcfg_TaskBackgroundColor</cstring> + </property> + <property name="text"> + <string></string> + </property> + </widget> + <widget class="TQLabel" row="0" column="0"> + <property name="name"> + <cstring>inactiveTaskTextColorLabel</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Inacti&ve task text color:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_InactiveTaskTextColor</cstring> + </property> + </widget> + </grid> + </widget> + </grid> + </widget> + <widget class="TQButtonGroup" row="1" column="1"> + <property name="name"> + <cstring>grpAppearanceMisc</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Miscellaneous</string> + </property> + <grid> <property name="name"> - <cstring>taskBackgroundColorLabel</cstring> + <cstring>unnamed</cstring> </property> - <property name="text"> - <string>&Background color:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>kcfg_TaskBackgroundColor</cstring> - </property> - </widget> - <widget class="KColorButton" row="0" column="7"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_ShowWindowListBtn</cstring> + </property> + <property name="text"> + <string>Show window list &button</string> + </property> + <property name="accel"> + <string>Alt+B</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="whatsThis" stdset="0"> + <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string> + </property> + </widget> + <widget class="TQSpinBox" row="1" column="1"> + <property name="name"> + <cstring>kcfg_MaximumButtonWidth</cstring> + </property> + <property name="suffix"> + <string> px</string> + </property> + <property name="maxValue"> + <number>500</number> + </property> + <property name="minValue"> + <number>10</number> + </property> + <property name="value"> + <number>200</number> + </property> + </widget> + <widget class="TQLabel" row="1" column="0"> + <property name="name"> + <cstring>maxButtonWidthLabel</cstring> + </property> + <property name="text"> + <string>Maximum button width:</string> + </property> + </widget> + </grid> + </widget> + <widget class="TQButtonGroup" row="1" column="0"> + <property name="name"> + <cstring>grpIconsNText</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Icons</string> + </property> + <grid> <property name="name"> - <cstring>kcfg_TaskBackgroundColor</cstring> + <cstring>unnamed</cstring> </property> - <property name="text"> - <string></string> - </property> - </widget> - <spacer row="0" column="8"> + <widget class="TQComboBox" row="0" column="2" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_DisplayIconsNText</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="whatsThis" stdset="0"> + <string>Choose taskbar display mode among <strong>Icons and text</strong>, <strong>Text only</strong> and <strong>Icons only</strong>.</string> + </property> + </widget> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="4"> + <property name="name"> + <cstring>kcfg_ShowThumbnails</cstring> + </property> + <property name="text"> + <string>Show thumbnails on hover</string> + </property> + </widget> + <spacer row="3" column="0"> + <property name="name"> + <cstring>spacer2_2_2_3</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Fixed</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + <spacer row="1" column="1"> + <property name="name"> + <cstring>spacer2_2_2_3_2</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Fixed</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>16</height> + </size> + </property> + </spacer> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>displayIconsNTextLabel</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string>Dis&play:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_DisplayIconsNText</cstring> + </property> + </widget> + <widget class="TQSpinBox" row="3" column="3"> + <property name="name"> + <cstring>kcfg_ThumbnailMaxDimension</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="suffix"> + <string> px</string> + </property> + <property name="maxValue"> + <number>500</number> + </property> + <property name="minValue"> + <number>50</number> + </property> + <property name="value"> + <number>100</number> + </property> + </widget> + <widget class="TQLabel" row="3" column="1" rowspan="1" colspan="2"> + <property name="name"> + <cstring>thumbMaxDimensionLabel</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Maximum dimension:</string> + </property> + </widget> + </grid> + </widget> + <widget class="TQButtonGroup" row="0" column="0"> + <property name="name"> + <cstring>grpTaskbarStyle</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Button style</string> + </property> + <grid> <property name="name"> - <cstring>spacer12</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> + <cstring>unnamed</cstring> </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>191</width> - <height>20</height> - </size> - </property> - </spacer> - </grid> - </widget> - <spacer row="1" column="0"> - <property name="name"> - <cstring>spacer2</cstring> - </property> - <property name="orientation"> - <enum>Horizontal</enum> - </property> - <property name="sizeType"> - <enum>Fixed</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </grid> - </widget> - <widget class="TQGroupBox"> - <property name="name"> - <cstring>actionsGroup</cstring> - </property> - <property name="title"> - <string>Actions</string> - </property> - <grid> + <widget class="TQLabel" row="0" column="0"> + <property name="name"> + <cstring>textLabel1</cstring> + </property> + <property name="text"> + <string>Taskbar style:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>appearance</cstring> + </property> + </widget> + <widget class="TQComboBox" row="0" column="1"> + <property name="name"> + <cstring>appearance</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>customAppearance</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="frameShape"> + <enum>StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>Raised</enum> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_HaloText</cstring> + </property> + <property name="text"> + <string>Draw halo around text</string> + </property> + <property name="accel"> + <string></string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_DrawButtons</cstring> + </property> + <property name="text"> + <string>Always draw items as buttons</string> + </property> + <property name="accel"> + <string></string> + </property> + </widget> + <spacer row="1" column="0"> + <property name="name"> + <cstring>spacer2_2_2_3_3</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Fixed</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + <widget class="TQCheckBox" row="1" column="1"> + <property name="name"> + <cstring>kcfg_ShowButtonOnHover</cstring> + </property> + <property name="text"> + <string>Draw items as buttons on hover</string> + </property> + <property name="accel"> + <string></string> + </property> + </widget> + </grid> + </widget> + </grid> + </widget> + </grid> + </widget> + <widget class="TQWidget"> <property name="name"> - <cstring>unnamed</cstring> + <cstring>tab</cstring> </property> - <widget class="TQLabel" row="0" column="0"> - <property name="name"> - <cstring>leftButtonLabel</cstring> - </property> - <property name="text"> - <string>&Left button:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>kcfg_LeftButtonAction</cstring> - </property> - </widget> - <widget class="TQLabel" row="1" column="0"> + <attribute name="title"> + <string>A&ctions</string> + </attribute> + <vbox> <property name="name"> - <cstring>middleButtonLabel</cstring> + <cstring>unnamed</cstring> </property> - <property name="text"> - <string>&Middle button:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>kcfg_MiddleButtonAction</cstring> - </property> - </widget> - <widget class="TQLabel" row="2" column="0"> - <property name="name"> - <cstring>rightButtonLabel</cstring> - </property> - <property name="text"> - <string>Right b&utton:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>kcfg_RightButtonAction</cstring> - </property> - </widget> - <widget class="TQComboBox" row="0" column="1"> - <property name="name"> - <cstring>kcfg_LeftButtonAction</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - <widget class="TQComboBox" row="1" column="1"> - <property name="name"> - <cstring>kcfg_MiddleButtonAction</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - <widget class="TQComboBox" row="2" column="1"> - <property name="name"> - <cstring>kcfg_RightButtonAction</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </grid> + <widget class="TQGroupBox"> + <property name="name"> + <cstring>actionsGroup</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>1</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Mouse Actions</string> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="TQLabel" row="0" column="0"> + <property name="name"> + <cstring>leftButtonLabel</cstring> + </property> + <property name="text"> + <string>&Left button:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_LeftButtonAction</cstring> + </property> + </widget> + <widget class="TQComboBox" row="0" column="1"> + <property name="name"> + <cstring>kcfg_LeftButtonAction</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + <widget class="TQLabel" row="1" column="0"> + <property name="name"> + <cstring>middleButtonLabel</cstring> + </property> + <property name="text"> + <string>&Middle button:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_MiddleButtonAction</cstring> + </property> + </widget> + <widget class="TQComboBox" row="1" column="1"> + <property name="name"> + <cstring>kcfg_MiddleButtonAction</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + <widget class="TQComboBox" row="2" column="1"> + <property name="name"> + <cstring>kcfg_RightButtonAction</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + <widget class="TQLabel" row="2" column="0"> + <property name="name"> + <cstring>rightButtonLabel</cstring> + </property> + <property name="text"> + <string>Right b&utton:</string> + </property> + <property name="buddy" stdset="0"> + <cstring>kcfg_RightButtonAction</cstring> + </property> + </widget> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>kcfg_CycleWheel</cstring> + </property> + <property name="text"> + <string>Cycle through windows with mouse wheel</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + <spacer row="3" column="0"> + <property name="name"> + <cstring>spacer11</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Fixed</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>21</height> + </size> + </property> + </spacer> + </grid> + </widget> + <spacer> + <property name="name"> + <cstring>spacer35</cstring> + </property> + <property name="orientation"> + <enum>Vertical</enum> + </property> + <property name="sizeType"> + <enum>Minimum</enum> + </property> + <property name="sizeHint"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </vbox> + </widget> </widget> - <spacer> - <property name="name"> - <cstring>Spacer1</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> </vbox> </widget> <connections> <connection> + <sender>kcfg_ShowThumbnails</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_ThumbnailMaxDimension</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_UseCustomColors</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_InactiveTaskTextColor</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_UseCustomColors</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_ActiveTaskTextColor</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_UseCustomColors</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_TaskBackgroundColor</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_ShowThumbnails</sender> + <signal>toggled(bool)</signal> + <receiver>thumbMaxDimensionLabel</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>kcfg_SortByApp</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_AllowDragAndDropReArrange</receiver> + <slot>setDisabled(bool)</slot> + </connection> + <connection> <sender>kcfg_ShowAllWindows</sender> <signal>toggled(bool)</signal> <receiver>kcfg_SortByDesktop</receiver> <slot>setEnabled(bool)</slot> </connection> + <connection> + <sender>kcfg_DrawButtons</sender> + <signal>toggled(bool)</signal> + <receiver>kcfg_ShowButtonOnHover</receiver> + <slot>setDisabled(bool)</slot> + </connection> </connections> -<tabstops> - <tabstop>kcfg_ShowAllWindows</tabstop> - <tabstop>kcfg_SortByDesktop</tabstop> - <tabstop>showAllScreens</tabstop> - <tabstop>kcfg_SortByApp</tabstop> - <tabstop>kcfg_AllowDragAndDropReArrange</tabstop> - <tabstop>kcfg_CycleWheel</tabstop> - <tabstop>kcfg_ShowOnlyIconified</tabstop> - <tabstop>kcfg_ShowWindowListBtn</tabstop> - <tabstop>kcfg_DisplayIconsNText</tabstop> - <tabstop>kcfg_GroupTasks</tabstop> - <tabstop>kcfg_ShowTaskStates</tabstop> - <tabstop>appearance</tabstop> - <tabstop>kcfg_UseCustomColors</tabstop> - <tabstop>kcfg_InactiveTaskTextColor</tabstop> - <tabstop>kcfg_ActiveTaskTextColor</tabstop> - <tabstop>kcfg_TaskBackgroundColor</tabstop> - <tabstop>kcfg_LeftButtonAction</tabstop> - <tabstop>kcfg_MiddleButtonAction</tabstop> - <tabstop>kcfg_RightButtonAction</tabstop> -</tabstops> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">kseparator.h</include> + <include location="global" impldecl="in implementation">tdefontcombo.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> + <include location="global" impldecl="in implementation">tqtabwidget.h</include> </includes> <layoutdefaults spacing="3" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg index 95596ad34..676834aac 100644 --- a/kicker/taskbar/taskbar.kcfg +++ b/kicker/taskbar/taskbar.kcfg @@ -91,9 +91,10 @@ </entry> <entry key="MaximumButtonWidth" type="Int" > <default>200</default> - <min>0</min> - <label></label> - <whatsthis></whatsthis> + <min>50</min> + <max>500</max> + <label>Maximum button width</label> + <whatsthis>The maximum width to which a taskbar item can expand.</whatsthis> </entry> <entry key="MinimumButtonHeight" type="Int" > <default>18</default> |