diff --git a/kcmkwin/kwintabbox/main.cpp b/kcmkwin/kwintabbox/main.cpp index 53b3144a67..6599baef27 100644 --- a/kcmkwin/kwintabbox/main.cpp +++ b/kcmkwin/kwintabbox/main.cpp @@ -228,8 +228,6 @@ void KWinTabBoxConfig::loadConfig(const KConfigGroup& config, KWin::TabBox::TabB config.readEntry("SwitchingMode", TabBox::TabBoxConfig::defaultSwitchingMode()))); tabBoxConfig.setLayout(TabBox::TabBoxConfig::LayoutMode( config.readEntry("LayoutMode", TabBox::TabBoxConfig::defaultLayoutMode()))); - tabBoxConfig.setSelectedItemViewPosition(TabBox::TabBoxConfig::SelectedItemViewPosition( - config.readEntry("SelectedItem", TabBox::TabBoxConfig::defaultSelectedItemViewPosition()))); tabBoxConfig.setShowDesktop(config.readEntry("ShowDesktop", TabBox::TabBoxConfig::defaultShowDesktop())); @@ -255,7 +253,6 @@ void KWinTabBoxConfig::saveConfig(KConfigGroup& config, const KWin::TabBox::TabB config.writeEntry("ListMode", int(tabBoxConfig.clientListMode())); config.writeEntry("SwitchingMode", int(tabBoxConfig.clientSwitchingMode())); config.writeEntry("LayoutMode", int(tabBoxConfig.layout())); - config.writeEntry("SelectedItem", int(tabBoxConfig.selectedItemViewPosition())); config.writeEntry("LayoutName", tabBoxConfig.layoutName()); config.writeEntry("SelectedLayoutName", tabBoxConfig.selectedItemLayoutName()); config.writeEntry("ShowDesktop", tabBoxConfig.isShowDesktop()); diff --git a/tabbox/tabboxconfig.cpp b/tabbox/tabboxconfig.cpp index c1fa4bb511..f17c12d70a 100644 --- a/tabbox/tabboxconfig.cpp +++ b/tabbox/tabboxconfig.cpp @@ -36,7 +36,6 @@ public: , clientListMode(TabBoxConfig::defaultListMode()) , clientSwitchingMode(TabBoxConfig::defaultSwitchingMode()) , desktopSwitchingMode(TabBoxConfig::MostRecentlyUsedDesktopSwitching) - , selectedItemViewPosition(TabBoxConfig::defaultSelectedItemViewPosition()) , minWidth(TabBoxConfig::defaultMinWidth()) , minHeight(TabBoxConfig::defaultMinHeight()) , layoutName(TabBoxConfig::defaultLayoutName()) @@ -54,7 +53,6 @@ public: TabBoxConfig::ClientListMode clientListMode; TabBoxConfig::ClientSwitchingMode clientSwitchingMode; TabBoxConfig::DesktopSwitchingMode desktopSwitchingMode; - TabBoxConfig::SelectedItemViewPosition selectedItemViewPosition; int minWidth; int minHeight; QString layoutName; @@ -83,7 +81,6 @@ TabBoxConfig& TabBoxConfig::operator=(const KWin::TabBox::TabBoxConfig& object) d->clientListMode = object.clientListMode(); d->clientSwitchingMode = object.clientSwitchingMode(); d->desktopSwitchingMode = object.desktopSwitchingMode(); - d->selectedItemViewPosition = object.selectedItemViewPosition(); d->selectedItemLayoutName = object.selectedItemLayoutName(); d->minWidth = object.minWidth(); d->minHeight = object.minHeight(); @@ -171,16 +168,6 @@ void TabBoxConfig::setDesktopSwitchingMode(DesktopSwitchingMode switchingMode) d->desktopSwitchingMode = switchingMode; } -TabBoxConfig::SelectedItemViewPosition TabBoxConfig::selectedItemViewPosition() const -{ - return d->selectedItemViewPosition; -} - -void TabBoxConfig::setSelectedItemViewPosition(SelectedItemViewPosition viewPosition) -{ - d->selectedItemViewPosition = viewPosition; -} - int TabBoxConfig::minWidth() const { return d->minWidth; diff --git a/tabbox/tabboxconfig.h b/tabbox/tabboxconfig.h index c8e5617575..bc239e1af8 100644 --- a/tabbox/tabboxconfig.h +++ b/tabbox/tabboxconfig.h @@ -94,18 +94,6 @@ public: ClientTabBox,///< TabBox uses TabBoxClientModel DesktopTabBox///< TabBox uses TabBoxDesktopModel }; - /** - * SelectedItemViewPosition defines where an additional view only showing the selected item is shown. - * This second view is useful when using for example icon only layout and wanting to provide the - * caption of selected item. - */ - enum SelectedItemViewPosition { - NonePosition,///< There is no additional view for selected item - AbovePosition,///< Additional view is positioned above of the switching list - BelowPosition,///< Additional view is positioned below of the switching list - LeftPosition,///< Additional view is positioned left of the switching list - RightPosition///< Additional view is positioned right of the switching list - }; TabBoxConfig(); ~TabBoxConfig(); TabBoxConfig& operator=(const TabBoxConfig& object); @@ -164,12 +152,6 @@ public: */ DesktopSwitchingMode desktopSwitchingMode() const; /** - * @return The position of the selected item view. - * @see setSelectedItemViewPosition - * @see defaultSelectedItemViewPosition - */ - SelectedItemViewPosition selectedItemViewPosition() const; - /** * @return The minimum width in percent of screen width the TabBox should use. * @see setMinWidth * @see minHeight @@ -247,11 +229,6 @@ public: */ void setDesktopSwitchingMode(DesktopSwitchingMode switchingMode); /** - * @param viewPosition The new position of the selected item view - * @see selectedItemViewPosition - */ - void setSelectedItemViewPosition(SelectedItemViewPosition viewPosition); - /** * @param value The minimum width of TabBox in percent of screen width. * @see minWidth */ @@ -287,9 +264,6 @@ public: static LayoutMode defaultLayoutMode() { return VerticalLayout; } - static SelectedItemViewPosition defaultSelectedItemViewPosition() { - return NonePosition; - } static bool defaultShowTabBox() { return true; }