From d94f3c85775eced122820960d6516dc6ddd7a048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Wed, 18 Feb 2015 00:09:46 +0100 Subject: [PATCH] remove secret showDesktopIsMinimizeAll feature REVIEW: 122679 --- kwin.kcfg | 3 --- manage.cpp | 2 +- options.cpp | 11 ----------- options.h | 8 -------- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/kwin.kcfg b/kwin.kcfg index 80ca365598..5846721c08 100644 --- a/kwin.kcfg +++ b/kwin.kcfg @@ -212,9 +212,6 @@ true - - false - false diff --git a/manage.cpp b/manage.cpp index c8e74cb84d..241d322b9d 100644 --- a/manage.cpp +++ b/manage.cpp @@ -603,7 +603,7 @@ bool Client::manage(xcb_window_t w, bool isMapped) } } - resetShowingDesktop(options->isShowDesktopIsMinimizeAll()); + resetShowingDesktop(false); if (isOnCurrentDesktop() && !isMapped && !allow && (!session || session->stackingOrder < 0)) workspace()->restackClientUnderActive(this); diff --git a/options.cpp b/options.cpp index cdaa8518a9..7362c6b80a 100644 --- a/options.cpp +++ b/options.cpp @@ -78,7 +78,6 @@ Options::Options(QObject *parent) , m_windowSnapZone(0) , m_centerSnapZone(0) , m_snapOnlyWhenOverlapping(false) - , m_showDesktopIsMinimizeAll(false) , m_rollOverDesktops(false) , m_focusStealingPreventionLevel(0) , m_legacyFullscreenSupport(false) @@ -284,15 +283,6 @@ void Options::setSnapOnlyWhenOverlapping(bool snapOnlyWhenOverlapping) emit snapOnlyWhenOverlappingChanged(); } -void Options::setShowDesktopIsMinimizeAll(bool showDesktopIsMinimizeAll) -{ - if (m_showDesktopIsMinimizeAll == showDesktopIsMinimizeAll) { - return; - } - m_showDesktopIsMinimizeAll = showDesktopIsMinimizeAll; - emit showDesktopIsMinimizeAllChanged(); -} - void Options::setRollOverDesktops(bool rollOverDesktops) { if (m_rollOverDesktops == rollOverDesktops) { @@ -864,7 +854,6 @@ void Options::syncFromKcfgc() setInactiveTabsSkipTaskbar(m_settings->inactiveTabsSkipTaskbar()); setAutogroupSimilarWindows(m_settings->autogroupSimilarWindows()); setAutogroupInForeground(m_settings->autogroupInForeground()); - setShowDesktopIsMinimizeAll(m_settings->showDesktopIsMinimizeAll()); setBorderlessMaximizedWindows(m_settings->borderlessMaximizedWindows()); setElectricBorderMaximize(m_settings->electricBorderMaximize()); setElectricBorderTiling(m_settings->electricBorderTiling()); diff --git a/options.h b/options.h index 67e5868a1d..23967cf829 100644 --- a/options.h +++ b/options.h @@ -103,7 +103,6 @@ class Options : public QObject * snap only when windows will overlap */ Q_PROPERTY(bool snapOnlyWhenOverlapping READ isSnapOnlyWhenOverlapping WRITE setSnapOnlyWhenOverlapping NOTIFY snapOnlyWhenOverlappingChanged) - Q_PROPERTY(bool showDesktopIsMinimizeAll READ isShowDesktopIsMinimizeAll WRITE setShowDesktopIsMinimizeAll NOTIFY showDesktopIsMinimizeAllChanged) /** * whether or not we roll over to the other edge when switching desktops past the edge */ @@ -323,10 +322,6 @@ public: return m_snapOnlyWhenOverlapping; } - bool isShowDesktopIsMinimizeAll() const { - return m_showDesktopIsMinimizeAll; - } - /** * whether or not we roll over to the other edge when switching desktops past the edge */ @@ -609,7 +604,6 @@ public: void setWindowSnapZone(int windowSnapZone); void setCenterSnapZone(int centerSnapZone); void setSnapOnlyWhenOverlapping(bool snapOnlyWhenOverlapping); - void setShowDesktopIsMinimizeAll(bool showDesktopIsMinimizeAll); void setRollOverDesktops(bool rollOverDesktops); void setFocusStealingPreventionLevel(int focusStealingPreventionLevel); void setLegacyFullscreenSupport(bool legacyFullscreenSupport); @@ -805,7 +799,6 @@ Q_SIGNALS: void windowSnapZoneChanged(); void centerSnapZoneChanged(); void snapOnlyWhenOverlappingChanged(); - void showDesktopIsMinimizeAllChanged(); void rollOverDesktopsChanged(bool enabled); void focusStealingPreventionLevelChanged(); void legacyFullscreenSupportChanged(); @@ -878,7 +871,6 @@ private: int m_windowSnapZone; int m_centerSnapZone; bool m_snapOnlyWhenOverlapping; - bool m_showDesktopIsMinimizeAll; bool m_rollOverDesktops; int m_focusStealingPreventionLevel; bool m_legacyFullscreenSupport;