From a24218a9a18ee1bcd2c8df63130faa2e09b9c031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 12 Dec 2013 08:07:46 +0100 Subject: [PATCH] [kwin/tabbox] Drop window strip switcher No longer needed in a Plasma2 world as the components have a thumbnail component, so the hack to go over KWin to render the thumbnails is no longer needed. Approved by Aaron on mailinglist: https://mail.kde.org/pipermail/active/2013-December/007254.html --- tabbox/qml/CMakeLists.txt | 2 - .../clients/window_strip/contents/ui/main.qml | 140 ------------------ .../qml/clients/window_strip/metadata.desktop | 96 ------------ 3 files changed, 238 deletions(-) delete mode 100644 tabbox/qml/clients/window_strip/contents/ui/main.qml delete mode 100644 tabbox/qml/clients/window_strip/metadata.desktop diff --git a/tabbox/qml/CMakeLists.txt b/tabbox/qml/CMakeLists.txt index 2d21930881..e471c485f8 100644 --- a/tabbox/qml/CMakeLists.txt +++ b/tabbox/qml/CMakeLists.txt @@ -9,7 +9,6 @@ install( DIRECTORY clients/sidebar DESTINATION ${DATA_INSTALL_DIR}/${KWIN_N install( DIRECTORY clients/small_icons DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox ) install( DIRECTORY clients/text DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox ) install( DIRECTORY clients/thumbnails DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox ) -install( DIRECTORY clients/window_strip DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox ) install( DIRECTORY desktops/informative DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/desktoptabbox ) install( DIRECTORY desktops/previews DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/desktoptabbox ) @@ -23,7 +22,6 @@ install( FILES clients/sidebar/metadata.desktop DESTINATION ${SERVICES_INST install( FILES clients/small_icons/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} RENAME kwin4_window_switcher_small_icons.desktop ) install( FILES clients/text/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} RENAME kwin4_window_switcher_text.desktop ) install( FILES clients/thumbnails/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} RENAME kwin4_window_switcher_thumbnails.desktop ) -install( FILES clients/window_strip/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} RENAME kwin4_window_switcher_window_strip.desktop ) install( FILES desktops/informative/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} RENAME kwin4_desktop_switcher_informative.desktop ) install( FILES desktops/previews/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} RENAME kwin4_desktop_switcher_previews.desktop ) diff --git a/tabbox/qml/clients/window_strip/contents/ui/main.qml b/tabbox/qml/clients/window_strip/contents/ui/main.qml deleted file mode 100644 index 766e0657c6..0000000000 --- a/tabbox/qml/clients/window_strip/contents/ui/main.qml +++ /dev/null @@ -1,140 +0,0 @@ -/******************************************************************** - KWin - the KDE window manager - This file is part of the KDE project. - -Copyright (C) 2011 Martin Gräßlin -Copyright (C) 2011 Marco Martin - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*********************************************************************/ -import QtQuick 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents -import org.kde.plasma.mobilecomponents 0.1 as MobileComponents -import org.kde.qtextracomponents 2.0 -import org.kde.kwin 0.1 as KWin - -Item { - id: thumbnailTabBox - property int screenWidth - property bool canStretchX: false - property bool canStretchY: false - width: screenWidth - height: 150 - clip: true - - - function setModel(model) { - thumbnailListView.model = model; - } - // just to get the margin sizes - PlasmaCore.FrameSvgItem { - id: hoverItem - imagePath: "widgets/viewitem" - prefix: "hover" - visible: false - } - - PlasmaCore.Svg { - id: iconsSvg - imagePath: "widgets/configuration-icons" - } - - ListView { - signal currentIndexChanged(int index) - id: thumbnailListView - objectName: "listView" - orientation: ListView.Horizontal - height: parent.height - spacing: 10 - anchors.fill: parent - clip: true - delegate: Item { - id: delegateItem - width: thumbnailListView.height * 1.6 + 48 - height: thumbnailListView.height - KWin.ThumbnailItem { - id: thumbnailItem - wId: windowId - width: parent.width - closeButtonContainer.width - 20 - height: thumbnailListView.height - windowTitle.height - 16 - clip: false - anchors { - horizontalCenter: parent.horizontalCenter - bottom: windowTitle.top - } - MouseArea { - anchors.fill: parent - onClicked: { - thumbnailListView.currentIndex = index; - thumbnailListView.currentIndexChanged(index); - } - } - } - PlasmaComponents.Label { - id: windowTitle - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - - height: paintedHeight - - text: caption - elide: Text.ElideRight - color: theme.textColor - width: parent.width - 40 - horizontalAlignment: Text.AlignHCenter - } - PlasmaCore.FrameSvgItem { - id: closeButtonContainer - imagePath: "widgets/button" - prefix: "shadow" - width: closeButton.width + margins.left + margins.right - height: closeButton.height + margins.top + margins.bottom - visible: closeable - anchors { - top: parent.top - right: parent.right - topMargin: 32 - } - - PlasmaCore.FrameSvgItem { - id: closeButton - imagePath: "widgets/button" - prefix: "normal" - //a bit more left margin - width: closeButtonSvg.width + margins.left + margins.right + 16 - height: closeButtonSvg.height + margins.top + margins.bottom - x: parent.margins.left - y: parent.margins.top - - MobileComponents.ActionButton { - id: closeButtonSvg - svg: iconsSvg - iconSize: 22 - backgroundVisible: false - elementId: "close" - - anchors { - verticalCenter: parent.verticalCenter - right: parent.right - rightMargin: parent.margins.right - } - - onClicked: thumbnailListView.model.close(index) - } - } - } - } - } -} diff --git a/tabbox/qml/clients/window_strip/metadata.desktop b/tabbox/qml/clients/window_strip/metadata.desktop deleted file mode 100644 index 72529dbe82..0000000000 --- a/tabbox/qml/clients/window_strip/metadata.desktop +++ /dev/null @@ -1,96 +0,0 @@ -[Desktop Entry] -Name=Window Strip -Name[bs]=Traka Prozora -Name[ca]=Cinta de finestres -Name[ca@valencia]=Cinta de finestres -Name[cs]=Pruh oken -Name[da]=Vinduesstribe -Name[de]=Fensterstreifen -Name[el]=Σειρά παραθύρων -Name[es]=Tira de ventanas -Name[et]=Aknariba -Name[fi]=Ikkunanauha -Name[fr]=Bandeau de fenêtres -Name[gl]=Lista de xanelas -Name[he]=רשימת חלונות -Name[hu]=Ablakszalag -Name[ia]=Lista de fenestra -Name[it]=Striscia di finestre -Name[kk]=Терезе жолағы -Name[km]=ស្គ្រីប​វីនដូ -Name[ko]=창 스트립 -Name[lt]=Lango juosta -Name[mr]=चौकट पट्टी -Name[nb]=Vindusstripe -Name[nl]=Vensterstrook -Name[pa]=ਵਿੰਡੋ ਪੱਟੀ -Name[pl]=Pas okien -Name[pt]=Barra da Janela -Name[pt_BR]=Barra da janela -Name[ru]=Лента окон -Name[sk]=Pás okna -Name[sl]=Pas z okni -Name[sr]=Појас прозора -Name[sr@ijekavian]=Појас прозора -Name[sr@ijekavianlatin]=Pojas prozora -Name[sr@latin]=Pojas prozora -Name[sv]=Fönsterserie -Name[tr]=Pencere Dilimi -Name[uk]=Стрічка-вікно -Name[x-test]=xxWindow Stripxx -Name[zh_CN]=窗口列表 -Name[zh_TW]=視窗帶 -Comment=Window switcher layout for Plasma Active -Comment[bs]=Prozor Switcher izgled za Plasma Active -Comment[ca]=Disposició del commutador de finestres pel Plasma Active -Comment[ca@valencia]=Disposició del commutador de finestres pel Plasma Active -Comment[da]=Et vinduesskifter-layout til Plasma Active -Comment[de]=Fensterwechsler-Layout für Plasma Active -Comment[el]=Διάταξη εναλλαγής παραθύρων για το Plasma Active -Comment[es]=Esquema de cambiador de ventanas para Plasma Active -Comment[et]=Plasma Active'i aknavahetaja paigutus -Comment[fi]=Plasma Activen tehtävänvalitsimen asettelu -Comment[fr]=Disposition du sélecteur de fenêtres pour Plasma Active -Comment[gl]=Disposición do alternador de xanelas para Plasma Active -Comment[hu]=Ablakváltó elrendezés a Plazma aktívhoz -Comment[ia]=Disposition de commutator de fenestra per Plasma Active -Comment[it]=Disposizione dello scambiafinestre per Plasma Active -Comment[kk]=Plasma Activt-тың терезе ауыстырғышының қалыпы -Comment[km]=ប្លង់​កម្មវិធី​ប្ដូរ​បង្អួជ​សម្រាប់​ប្លាស្មា​សកម្ម -Comment[ko]=Plasma Active 창 전환기 레이아웃 -Comment[lt]=Langų perjungimo išdėstymas skirtas Plasma Active -Comment[mr]=प्लाज्मा एक्टिव्ह करिता चौकट बदल रचना -Comment[nb]=Vindusbytterutforming for Plasma Active -Comment[nl]=Indeling van de vensterwisselaar voor Plasma Active -Comment[pa]=ਪਲਾਜ਼ਮਾ ਐਕਟਿਵ ਲਈ ਵਿੰਡੋ ਸਵਿੱਚਰ ਲੇਆਉਟ -Comment[pl]=Układ przełączania okien dla Plasma Active -Comment[pt]=A disposição de mudança de janelas do Plasma Active -Comment[pt_BR]=Um leiaute do seletor de janelas do Plasma Active -Comment[ru]=Визуализация переключателя окон, используемая в Plasma Active -Comment[sk]=Rozloženie prepínača okien pre Plasma Active -Comment[sl]=Razpored preklapljanja med okni za Plasma Active -Comment[sr]=Распоред мењача прозора за Плазма актив -Comment[sr@ijekavian]=Распоред мењача прозора за Плазма актив -Comment[sr@ijekavianlatin]=Raspored menjača prozora za Plasma aktiv -Comment[sr@latin]=Raspored menjača prozora za Plasma aktiv -Comment[sv]=Layout för fönsterbyte för Plasma aktivt -Comment[tr]=Plasma Active için pencere seçme düzeni -Comment[uk]=Компонування засобу перемикання вікон для портативної Плазми -Comment[x-test]=xxWindow switcher layout for Plasma Activexx -Comment[zh_CN]=Plasma Active 的窗口切换布局 -Comment[zh_TW]=Plasma Active 使用的視窗切換器佈局 -Icon=preferences-system-windows-switcher-window-strip - -X-Plasma-API=declarativeappletscript -X-Plasma-MainScript=ui/main.qml -X-KWin-Exclude-Listing=true - -X-KDE-PluginInfo-Author=Martin Gräßlin -X-KDE-PluginInfo-Email=mgraesslin@kde.org -X-KDE-PluginInfo-Name=window_strip -X-KDE-PluginInfo-Version=1.0 - -X-KDE-PluginInfo-Depends= -X-KDE-PluginInfo-License=GPL -X-KDE-ServiceTypes=KWin/WindowSwitcher -Type=Service