diff --git a/tabbox/qml/CMakeLists.txt b/tabbox/qml/CMakeLists.txt index e471c485f8..fc55ab9a20 100644 --- a/tabbox/qml/CMakeLists.txt +++ b/tabbox/qml/CMakeLists.txt @@ -1,5 +1,3 @@ -install( FILES tabbox.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox ) - # packages install( DIRECTORY clients/big_icons DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox ) install( DIRECTORY clients/compact DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox ) @@ -26,14 +24,5 @@ install( FILES clients/thumbnails/metadata.desktop DESTINATION ${SERVICES_INST 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 ) -install (FILES IconTabBox.qml ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/big_icons/contents/ui) -install (FILES IconTabBox.qml ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/small_icons/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/compact/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/informative/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/present_windows/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/thumbnails/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/text/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/sidebar/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/desktoptabbox/informative/contents/ui) -install (FILES ShadowedSvgItem.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/desktoptabbox/previews/contents/ui) +install (FILES IconTabBox.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/big_icons/contents/ui) +install (FILES IconTabBox.qml DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/tabbox/small_icons/contents/ui) diff --git a/tabbox/qml/ShadowedSvgItem.qml b/tabbox/qml/ShadowedSvgItem.qml deleted file mode 100644 index 2fcb5979a4..0000000000 --- a/tabbox/qml/ShadowedSvgItem.qml +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************** - KWin - the KDE window manager - This file is part of the KDE project. - -Copyright (C) 2013 Weng Xuetian - -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 - -Item { - property double leftMargin: shadow.margins.left + background.margins.left - property double topMargin: shadow.margins.top + background.margins.top - property double rightMargin: shadow.margins.right + background.margins.right - property double bottomMargin: shadow.margins.bottom + background.margins.bottom - property double centerWidth: shadow.width - shadow.margins.left - shadow.margins.right - property double centerHeight: shadow.height - shadow.margins.bottom - shadow.margins.top - property int centerTopMargin: shadow.margins.top - property int centerLeftMargin: shadow.margins.left - property alias maskImagePath: shadow.imagePath - property alias enabledBorders: background.enabledBorders - - PlasmaCore.FrameSvg { - id: themeInfo - imagePath: "dialogs/background" - property bool hasNewShadows: hasElementPrefix("shadow") - } - - PlasmaCore.FrameSvgItem { - id: shadow - prefix: themeInfo.hasNewShadows ? "shadow" : "" - - imagePath: "dialogs/background" - anchors.fill: parent - visible: true - enabledBorders: background.enabledBorders - - PlasmaCore.FrameSvgItem { - id: background - imagePath: shadow.imagePath - visible: themeInfo.hasNewShadows - anchors { - fill: parent - leftMargin: shadow.margins.left - topMargin: shadow.margins.top - rightMargin: shadow.margins.right - bottomMargin: shadow.margins.bottom - } - } - } -} diff --git a/tabbox/qml/tabbox.qml b/tabbox/qml/tabbox.qml deleted file mode 100644 index 04f5f7751b..0000000000 --- a/tabbox/qml/tabbox.qml +++ /dev/null @@ -1,80 +0,0 @@ -/******************************************************************** - KWin - the KDE window manager - This file is part of the KDE project. - -Copyright (C) 2011 Martin Gräßlin - -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 - -Loader { - id: loader - focus: true - property int screenWidth : 0 - property int screenHeight : 0 - property bool allDesktops: true - property int alignment: item && item.alignment ? item.alignment : Qt.AlignCenter - property string longestCaption: "" - property string maskImagePath: item && item.maskImagePath != undefined ? item.maskImagePath : "" - property double maskWidth: item && item.maskWidth != undefined ? item.maskWidth : 0 - property double maskHeight: item && item.maskHeight != undefined ? item.maskHeight : 0 - property int maskTopMargin: item && item.maskTopMargin != undefined ? item.maskTopMargin : 0 - property int maskLeftMargin: item && item.maskLeftMargin != undefined ? item.maskLeftMargin : 0 - onLoaded: { - if (item.screenWidth != undefined) { - item.screenWidth = screenWidth; - } - if (item.screenHeight != undefined) { - item.screenHeight = screenHeight; - } - if (item.allDesktops != undefined) { - item.allDesktops = allDesktops; - } - if (item.longestCaption != undefined) { - item.longestCaption = longestCaption; - } - if (item.setModel) { - item.setModel(clientModel); - } - } - onScreenWidthChanged: { - if (item && item.screenWidth != undefined) { - item.screenWidth = screenWidth; - } - } - onScreenHeightChanged: { - if (item && item.screenHeight != undefined) { - item.screenHeight = screenHeight; - } - } - onAllDesktopsChanged: { - if (item && item.allDesktops != undefined) { - item.allDesktops= allDesktops; - } - } - onLongestCaptionChanged: { - if (item && item.longestCaption != undefined) { - item.longestCaption = longestCaption; - } - } - Connections { - target: clientModel - onModelReset: { - if (item && item.modelChanged) { - item.modelChanged(); - } - } - } -}