diff --git a/abstract_client.cpp b/abstract_client.cpp
--- a/abstract_client.cpp
+++ b/abstract_client.cpp
@@ -1164,7 +1164,6 @@
updateCursor();
break;
}
- case Options::MouseDragTab:
case Options::MouseNothing:
default:
replay = true;
@@ -1644,8 +1643,8 @@
com = active ? options->commandActiveTitlebar3() : options->commandInactiveTitlebar3();
if (event->button() == Qt::LeftButton
&& com != Options::MouseOperationsMenu // actions where it's not possible to get the matching
- && com != Options::MouseMinimize // mouse release event
- && com != Options::MouseDragTab) {
+ && com != Options::MouseMinimize) // mouse release event
+ {
setMoveResizePointerMode(mousePosition());
setMoveResizePointerButtonDown(true);
setMoveOffset(event->pos());
@@ -1665,7 +1664,6 @@
com == Options::MouseActivate ||
com == Options::MouseActivateRaiseAndPassClick ||
com == Options::MouseActivateAndPassClick ||
- com == Options::MouseDragTab ||
com == Options::MouseNothing);
}
diff --git a/doc/windowbehaviour/index.docbook b/doc/windowbehaviour/index.docbook
--- a/doc/windowbehaviour/index.docbook
+++ b/doc/windowbehaviour/index.docbook
@@ -42,8 +42,7 @@
mouse clicks. Moving allows you to configure how
windows move and place themselves when started. The
Advanced options cover some specialized options
-like window tabbing
and window
-shading
.
+like window shading
.
@@ -279,7 +278,7 @@
Similar options are available for Wheel event.
-
+
@@ -340,7 +339,7 @@
@@ -531,7 +530,7 @@
@@ -639,19 +638,6 @@
-Window Tabbing
-
-
-Automatically group similar windows
-When turned on attempt to automatically detect when a newly opened window is
-related to an existing one and place them in the same window group.
-
-
-
-Switch to automatically grouped windows immediately
-When turned on immediately switch to any new window tabs that were
-automatically added to the current group.
-
Placement
diff --git a/kcmkwin/kwinoptions/actions.ui b/kcmkwin/kwinoptions/actions.ui
--- a/kcmkwin/kwinoptions/actions.ui
+++ b/kcmkwin/kwinoptions/actions.ui
@@ -408,11 +408,6 @@
Change Opacity
- -
-
- Switch to Window Tab to the Left/Right
-
-
-
Nothing
diff --git a/kcmkwin/kwinoptions/advanced.ui b/kcmkwin/kwinoptions/advanced.ui
--- a/kcmkwin/kwinoptions/advanced.ui
+++ b/kcmkwin/kwinoptions/advanced.ui
@@ -10,89 +10,142 @@
387
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
+
+
-
+
- Qt::Horizontal
+ Qt::Vertical
- 40
- 20
+ 20
+ 40
- -
-
+
-
+
- Window Tabbing
+ Shading
true
-
-
-
-
+
+
-
+
+
+ Dela&y:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ shadeHover
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 24
+ 20
+
+
+
+
+ -
+
- When turned on hide all tabs that are not active from the taskbar.
+ If Shade Hover is enabled, a shaded window will un-shade automatically when the mouse pointer has been over the title bar for some time.
- Hide inactive window tabs from the taskbar
+ &Enable hover
- -
-
+
-
+
- When turned on attempt to automatically detect when a newly opened window is related to an existing one and place them in the same window group.
+ Sets the time in milliseconds before the window unshades when the mouse pointer goes over the shaded window.
-
- Automatically group similar windows
+
+ ms
+
+
+ 0
+
+
+ 3000
+
+
+ 100
+
+
+ 99
+
+
+
+ -
+
+
+ Special Windows
+
+
+ true
+
+
-
-
+
- When turned on immediately switch to any new window tabs that were automatically added to the current group.
+ When turned on, utility windows (tool windows, torn-off menus,...) of inactive applications will be hidden and will be shown only when the application becomes active. Note that applications have to mark the windows with the proper window type for this feature to work.
- Switch to automatically grouped windows immediately
+ Hide utility windows for inactive applications
- -
-
+
-
+
- Qt::Vertical
+ Qt::Horizontal
- 20
- 40
+ 40
+ 20
- -
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
&Placement:
@@ -160,121 +213,18 @@
- -
-
-
- Shading
-
-
- true
-
-
-
-
-
-
- Dela&y:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- shadeHover
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 24
- 20
-
-
-
-
- -
-
-
- If Shade Hover is enabled, a shaded window will un-shade automatically when the mouse pointer has been over the title bar for some time.
-
-
- &Enable hover
-
-
-
- -
-
-
- Sets the time in milliseconds before the window unshades when the mouse pointer goes over the shaded window.
-
-
- 500
-
-
- 0
-
-
- 3000
-
-
- 100
-
-
- ms
-
-
-
-
-
-
- -
-
-
- Special Windows
-
-
- true
-
-
-
-
-
-
- When turned on, utility windows (tool windows, torn-off menus,...) of inactive applications will be hidden and will be shown only when the application becomes active. Note that applications have to mark the windows with the proper window type for this feature to work.
-
-
- Hide utility windows for inactive applications
-
-
-
-
-
-
KComboBox
QComboBox
-
- QSpinBox
- QWidget
-
-
shadeHoverOn
shadeHover
- inactiveTabsSkipTaskbar
- autogroupSimilarWindows
- autogroupInForeground
placementCombo
hideUtilityWindowsForInactive
diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp
--- a/kcmkwin/kwinoptions/mouse.cpp
+++ b/kcmkwin/kwinoptions/mouse.cpp
@@ -220,7 +220,6 @@
"Shade",
"Close",
"Operations menu",
- "Start window tab drag",
"Nothing",
""
};
@@ -236,7 +235,6 @@
"Shade",
"Close",
"Operations menu",
- "Start window tab drag",
"Nothing",
""
};
@@ -283,7 +281,6 @@
"Above/Below",
"Previous/Next Desktop",
"Change Opacity",
- "Switch to Window Tab to the Left/Right",
"Nothing",
""
};
@@ -295,7 +292,6 @@
"Above/Below",
"Previous/Next Desktop",
"Change Opacity",
- "Switch to Window Tab to the Left/Right",
"Nothing",
""
};
@@ -397,11 +393,11 @@
KConfigGroup cg(config, "MouseBindings");
setComboText(m_ui->coTiAct1, cg.readEntry("CommandActiveTitlebar1", "Raise").toLatin1());
- setComboText(m_ui->coTiAct2, cg.readEntry("CommandActiveTitlebar2", "Start Window Tab Drag").toLatin1());
+ setComboText(m_ui->coTiAct2, cg.readEntry("CommandActiveTitlebar2", "Nothing").toLatin1());
setComboText(m_ui->coTiAct3, cg.readEntry("CommandActiveTitlebar3", "Operations menu").toLatin1());
- setComboText(m_ui->coTiAct4, cg.readEntry("CommandTitlebarWheel", "Switch to Window Tab to the Left/Right").toLatin1());
+ setComboText(m_ui->coTiAct4, cg.readEntry("CommandTitlebarWheel", "Nothing").toLatin1());
setComboText(m_ui->coTiInAct1, cg.readEntry("CommandInactiveTitlebar1", "Activate and raise").toLatin1());
- setComboText(m_ui->coTiInAct2, cg.readEntry("CommandInactiveTitlebar2", "Start Window Tab Drag").toLatin1());
+ setComboText(m_ui->coTiInAct2, cg.readEntry("CommandInactiveTitlebar2", "Nothing").toLatin1());
setComboText(m_ui->coTiInAct3, cg.readEntry("CommandInactiveTitlebar3", "Operations menu").toLatin1());
}
@@ -436,11 +432,11 @@
{
setComboText(m_ui->coTiDbl, "Maximize");
setComboText(m_ui->coTiAct1, "Raise");
- setComboText(m_ui->coTiAct2, "Start Window Tab Drag");
+ setComboText(m_ui->coTiAct2, "Nothing");
setComboText(m_ui->coTiAct3, "Operations menu");
- setComboText(m_ui->coTiAct4, "Switch to Window Tab to the Left/Right");
+ setComboText(m_ui->coTiAct4, "Nothing");
setComboText(m_ui->coTiInAct1, "Activate and raise");
- setComboText(m_ui->coTiInAct2, "Start Window Tab Drag");
+ setComboText(m_ui->coTiInAct2, "Nothing");
setComboText(m_ui->coTiInAct3, "Operations menu");
setComboText(m_ui->leftClickMaximizeButton, tbl_Max[0]);
setComboText(m_ui->middleClickMaximizeButton, tbl_Max[1]);
diff --git a/kcmkwin/kwinoptions/mouse.ui b/kcmkwin/kwinoptions/mouse.ui
--- a/kcmkwin/kwinoptions/mouse.ui
+++ b/kcmkwin/kwinoptions/mouse.ui
@@ -151,11 +151,6 @@
Change Opacity
- -
-
- Switch to Window Tab to the Left/Right
-
-
-
Nothing
@@ -267,11 +262,6 @@
Operations Menu
- -
-
- Start Window Tab Drag
-
-
-
Nothing
@@ -340,11 +330,6 @@
Operations Menu
- -
-
- Start Window Tab Drag
-
-
-
Nothing
@@ -411,11 +396,6 @@
Operations Menu
- -
-
- Start Window Tab Drag
-
-
-
Nothing
@@ -484,11 +464,6 @@
Operations Menu
- -
-
- Start Window Tab Drag
-
-
-
Nothing
@@ -555,11 +530,6 @@
Operations Menu
- -
-
- Start Window Tab Drag
-
-
-
Nothing
@@ -628,11 +598,6 @@
Operations Menu
- -
-
- Start Window Tab Drag
-
-
-
Nothing
diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h
--- a/kcmkwin/kwinoptions/windows.h
+++ b/kcmkwin/kwinoptions/windows.h
@@ -183,9 +183,6 @@
KWinAdvancedConfigForm *m_ui;
void setHideUtilityWindowsForInactive(bool);
- void setInactiveTabsSkipTaskbar(bool);
- void setAutogroupSimilarWindows(bool);
- void setAutogroupInForeground(bool);
};
#endif // KKWMWINDOWS_H
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -370,14 +370,10 @@
m_ui->placementCombo->setItemData(6, "UnderMouse");
connect(m_ui->shadeHoverOn, SIGNAL(toggled(bool)), this, SLOT(shadeHoverChanged(bool)));
- connect(m_ui->inactiveTabsSkipTaskbar, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(m_ui->autogroupSimilarWindows, SIGNAL(toggled(bool)), SLOT(changed()));
- connect(m_ui->autogroupInForeground, SIGNAL(toggled(bool)), SLOT(changed()));
connect(m_ui->shadeHoverOn, SIGNAL(toggled(bool)), SLOT(changed()));
connect(m_ui->shadeHover, SIGNAL(valueChanged(int)), SLOT(changed()));
connect(m_ui->placementCombo, SIGNAL(activated(int)), SLOT(changed()));
connect(m_ui->hideUtilityWindowsForInactive, SIGNAL(toggled(bool)), SLOT(changed()));
- m_ui->inactiveTabsSkipTaskbar->setVisible(false); // TODO: We want translations in case this is fixed...
load();
}
@@ -430,9 +426,6 @@
m_ui->placementCombo->setCurrentIndex(idx);
setHideUtilityWindowsForInactive(cg.readEntry(KWIN_HIDE_UTILITY, true));
- setInactiveTabsSkipTaskbar(cg.readEntry(KWIN_INACTIVE_SKIP_TASKBAR, false));
- setAutogroupSimilarWindows(cg.readEntry(KWIN_AUTOGROUP_SIMILAR, false));
- setAutogroupInForeground(cg.readEntry(KWIN_AUTOGROUP_FOREGROUND, true));
emit KCModule::changed(false);
}
@@ -447,13 +440,8 @@
v = getShadeHoverInterval();
if (v < 0) v = 0;
cg.writeEntry(KWIN_SHADEHOVER_INTERVAL, v);
-
cg.writeEntry(KWIN_PLACEMENT, m_ui->placementCombo->itemData(m_ui->placementCombo->currentIndex()).toString());
-
cg.writeEntry(KWIN_HIDE_UTILITY, m_ui->hideUtilityWindowsForInactive->isChecked());
- cg.writeEntry(KWIN_INACTIVE_SKIP_TASKBAR, m_ui->inactiveTabsSkipTaskbar->isChecked());
- cg.writeEntry(KWIN_AUTOGROUP_SIMILAR, m_ui->autogroupSimilarWindows->isChecked());
- cg.writeEntry(KWIN_AUTOGROUP_FOREGROUND, m_ui->autogroupInForeground->isChecked());
if (standAlone) {
config->sync();
@@ -472,9 +460,6 @@
setShadeHoverInterval(250);
m_ui->placementCombo->setCurrentIndex(0); // default to Smart
setHideUtilityWindowsForInactive(true);
- setInactiveTabsSkipTaskbar(false);
- setAutogroupSimilarWindows(false);
- setAutogroupInForeground(true);
emit KCModule::changed(true);
}
@@ -484,21 +469,6 @@
m_ui->hideUtilityWindowsForInactive->setChecked(s);
}
-void KAdvancedConfig::setInactiveTabsSkipTaskbar(bool s)
-{
- m_ui->inactiveTabsSkipTaskbar->setChecked(s);
-}
-
-void KAdvancedConfig::setAutogroupSimilarWindows(bool s)
-{
- m_ui->autogroupSimilarWindows->setChecked(s);
-}
-
-void KAdvancedConfig::setAutogroupInForeground(bool s)
-{
- m_ui->autogroupInForeground->setChecked(s);
-}
-
KWinMovingConfigForm::KWinMovingConfigForm(QWidget* parent)
: QWidget(parent)
{
diff --git a/kwin.kcfg b/kwin.kcfg
--- a/kwin.kcfg
+++ b/kwin.kcfg
@@ -6,7 +6,7 @@
- Switch to Window Tab to the Left/Right
+ Nothing
Alt
@@ -18,16 +18,16 @@
Raise
- Start Window Tab Drag
+ Nothing
Operations menu
Activate and raise
- Start Window Tab Drag
+ Nothing
Operations menu
diff --git a/options.h b/options.h
--- a/options.h
+++ b/options.h
@@ -391,14 +391,14 @@
MouseNextDesktop, MousePreviousDesktop,
MouseAbove, MouseBelow,
MouseOpacityMore, MouseOpacityLess,
- MouseClose, MousePreviousTab, MouseNextTab, MouseDragTab,
+ MouseClose,
MouseNothing
};
enum MouseWheelCommand {
MouseWheelRaiseLower, MouseWheelShadeUnshade, MouseWheelMaximizeRestore,
MouseWheelAboveBelow, MouseWheelPreviousNextDesktop,
- MouseWheelChangeOpacity, MouseWheelChangeCurrentTab,
+ MouseWheelChangeOpacity,
MouseWheelNothing
};
@@ -671,16 +671,16 @@
return MouseRaise;
}
static MouseCommand defaultCommandActiveTitlebar2() {
- return MouseDragTab;
+ return MouseNothing;
}
static MouseCommand defaultCommandActiveTitlebar3() {
return MouseOperationsMenu;
}
static MouseCommand defaultCommandInactiveTitlebar1() {
return MouseActivateAndRaise;
}
static MouseCommand defaultCommandInactiveTitlebar2() {
- return MouseDragTab;
+ return MouseNothing;
}
static MouseCommand defaultCommandInactiveTitlebar3() {
return MouseOperationsMenu;
@@ -707,7 +707,7 @@
return MouseUnrestrictedResize;
}
static MouseWheelCommand defaultCommandTitlebarWheel() {
- return MouseWheelChangeCurrentTab;
+ return MouseWheelNothing;
}
static MouseWheelCommand defaultCommandAllWheel() {
return MouseWheelNothing;
diff --git a/options.cpp b/options.cpp
--- a/options.cpp
+++ b/options.cpp
@@ -788,14 +788,14 @@
// Mouse bindings
config = KConfigGroup(m_settings->config(), "MouseBindings");
// TODO: add properties for missing options
- CmdTitlebarWheel = mouseWheelCommand(config.readEntry("CommandTitlebarWheel", "Switch to Window Tab to the Left/Right"));
+ CmdTitlebarWheel = mouseWheelCommand(config.readEntry("CommandTitlebarWheel", "Nothing"));
CmdAllModKey = (config.readEntry("CommandAllKey", "Alt") == QStringLiteral("Meta")) ? Qt::Key_Meta : Qt::Key_Alt;
CmdAllWheel = mouseWheelCommand(config.readEntry("CommandAllWheel", "Nothing"));
setCommandActiveTitlebar1(mouseCommand(config.readEntry("CommandActiveTitlebar1", "Raise"), true));
- setCommandActiveTitlebar2(mouseCommand(config.readEntry("CommandActiveTitlebar2", "Start Window Tab Drag"), true));
+ setCommandActiveTitlebar2(mouseCommand(config.readEntry("CommandActiveTitlebar2", "Nothing"), true));
setCommandActiveTitlebar3(mouseCommand(config.readEntry("CommandActiveTitlebar3", "Operations menu"), true));
setCommandInactiveTitlebar1(mouseCommand(config.readEntry("CommandInactiveTitlebar1", "Activate and raise"), true));
- setCommandInactiveTitlebar2(mouseCommand(config.readEntry("CommandInactiveTitlebar2", "Start Window Tab Drag"), true));
+ setCommandInactiveTitlebar2(mouseCommand(config.readEntry("CommandInactiveTitlebar2", "Nothing"), true));
setCommandInactiveTitlebar3(mouseCommand(config.readEntry("CommandInactiveTitlebar3", "Operations menu"), true));
setCommandWindow1(mouseCommand(config.readEntry("CommandWindow1", "Activate, raise and pass click"), false));
setCommandWindow2(mouseCommand(config.readEntry("CommandWindow2", "Activate and pass click"), false));
@@ -1042,7 +1042,6 @@
if (lowerName == QStringLiteral("resize")) return restricted ? MouseResize : MouseUnrestrictedResize;
if (lowerName == QStringLiteral("shade")) return MouseShade;
if (lowerName == QStringLiteral("minimize")) return MouseMinimize;
- if (lowerName == QStringLiteral("start window tab drag")) return MouseDragTab;
if (lowerName == QStringLiteral("close")) return MouseClose;
if (lowerName == QStringLiteral("increase opacity")) return MouseOpacityMore;
if (lowerName == QStringLiteral("decrease opacity")) return MouseOpacityLess;
@@ -1059,9 +1058,8 @@
if (lowerName == QStringLiteral("above/below")) return MouseWheelAboveBelow;
if (lowerName == QStringLiteral("previous/next desktop")) return MouseWheelPreviousNextDesktop;
if (lowerName == QStringLiteral("change opacity")) return MouseWheelChangeOpacity;
- if (lowerName == QStringLiteral("switch to window tab to the left/right")) return MouseWheelChangeCurrentTab;
if (lowerName == QStringLiteral("nothing")) return MouseWheelNothing;
- return MouseWheelChangeCurrentTab;
+ return MouseWheelNothing;
}
bool Options::showGeometryTip() const
@@ -1089,8 +1087,6 @@
return delta > 0 ? MousePreviousDesktop : MouseNextDesktop;
case MouseWheelChangeOpacity:
return delta > 0 ? MouseOpacityMore : MouseOpacityLess;
- case MouseWheelChangeCurrentTab:
- return delta > 0 ? MousePreviousTab : MouseNextTab;
default:
return MouseNothing;
}