[kwin/tabbox] Informative qml uses new Switcher item and PlasmaCore.Dialog
Reference implementation for the adjustments to use a PlasmaCore.Dialog and the new required switcher item.
This commit is contained in:
Martin Gräßlin
parent
d536532f66
commit
4ff2a5ea3e
1 changed files with 166 additions and 174 deletions
|
|
@ -20,196 +20,188 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
import QtQuick 2.0
|
import QtQuick 2.0
|
||||||
import org.kde.plasma.core 2.0 as PlasmaCore
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
||||||
import org.kde.qtextracomponents 2.0
|
import org.kde.qtextracomponents 2.0
|
||||||
|
import org.kde.kwin 2.0 as KWin
|
||||||
|
|
||||||
Item {
|
KWin.Switcher {
|
||||||
id: informativeTabBox
|
id: tabBox
|
||||||
property int screenWidth : 0
|
currentIndex: listView.currentIndex
|
||||||
property int screenHeight : 0
|
|
||||||
property bool allDesktops: true
|
|
||||||
property string longestCaption: ""
|
|
||||||
property int optimalWidth: listView.maxRowWidth
|
|
||||||
property int optimalHeight: listView.rowHeight * listView.count + background.topMargin + background.bottomMargin
|
|
||||||
property bool canStretchX: true
|
|
||||||
property bool canStretchY: false
|
|
||||||
property string maskImagePath: background.maskImagePath
|
|
||||||
property double maskWidth: background.centerWidth
|
|
||||||
property double maskHeight: background.centerHeight
|
|
||||||
property int maskTopMargin: background.centerTopMargin
|
|
||||||
property int maskLeftMargin: background.centerLeftMargin
|
|
||||||
width: Math.min(Math.max(screenWidth * 0.2, optimalWidth), screenWidth * 0.8)
|
|
||||||
height: Math.min(Math.max(screenHeight * 0.2, optimalHeight), screenHeight * 0.8)
|
|
||||||
focus: true
|
|
||||||
|
|
||||||
property int textMargin: 2
|
PlasmaCore.Dialog {
|
||||||
|
id: informativeTabBox
|
||||||
|
property bool canStretchX: true
|
||||||
|
property bool canStretchY: false
|
||||||
|
|
||||||
onLongestCaptionChanged: {
|
property int textMargin: 2
|
||||||
listView.maxRowWidth = listView.calculateMaxRowWidth();
|
|
||||||
}
|
|
||||||
|
|
||||||
function setModel(model) {
|
location: PlasmaCore.Types.Floating
|
||||||
listView.model = model;
|
visible: tabBox.visible
|
||||||
listView.maxRowWidth = listView.calculateMaxRowWidth();
|
windowFlags: Qt.X11BypassWindowManagerHint
|
||||||
}
|
onVisibleChanged: {
|
||||||
|
if (visible) {
|
||||||
/**
|
informativeTabBox.x = tabBox.screenGeometry.x + tabBox.screenGeometry.width * 0.5 - dialogMainItem.width * 0.5;
|
||||||
* Returns the caption with adjustments for minimized items.
|
informativeTabBox.y = tabBox.screenGeometry.y + tabBox.screenGeometry.height * 0.5 - dialogMainItem.height * 0.5;
|
||||||
* @param caption the original caption
|
}
|
||||||
* @param mimized whether the item is minimized
|
|
||||||
* @return Caption adjusted for minimized state
|
|
||||||
**/
|
|
||||||
function itemCaption(caption, minimized) {
|
|
||||||
var text = caption;
|
|
||||||
if (minimized) {
|
|
||||||
text = "(" + text + ")";
|
|
||||||
}
|
}
|
||||||
return text;
|
|
||||||
}
|
|
||||||
|
|
||||||
// just to get the margin sizes
|
mainItem: Item {
|
||||||
PlasmaCore.FrameSvgItem {
|
id: dialogMainItem
|
||||||
id: hoverItem
|
property int optimalWidth: listView.maxRowWidth
|
||||||
imagePath: "widgets/viewitem"
|
property int optimalHeight: listView.rowHeight * listView.count
|
||||||
prefix: "hover"
|
width: Math.min(Math.max(tabBox.screenGeometry.width * 0.2, optimalWidth), tabBox.screenGeometry.width * 0.8)
|
||||||
visible: false
|
height: Math.min(Math.max(tabBox.screenGeometry.height * 0.2, optimalHeight), tabBox.screenGeometry.height * 0.8)
|
||||||
}
|
focus: true
|
||||||
|
|
||||||
ShadowedSvgItem {
|
// just to get the margin sizes
|
||||||
id: background
|
PlasmaCore.FrameSvgItem {
|
||||||
anchors.fill: parent
|
id: hoverItem
|
||||||
}
|
imagePath: "widgets/viewitem"
|
||||||
|
prefix: "hover"
|
||||||
|
visible: false
|
||||||
|
}
|
||||||
|
|
||||||
// delegate
|
// delegate
|
||||||
Component {
|
Component {
|
||||||
id: listDelegate
|
id: listDelegate
|
||||||
Item {
|
Item {
|
||||||
id: delegateItem
|
id: delegateItem
|
||||||
width: listView.width
|
width: listView.width
|
||||||
height: listView.rowHeight
|
height: listView.rowHeight
|
||||||
QIconItem {
|
QIconItem {
|
||||||
id: iconItem
|
id: iconItem
|
||||||
icon: model.icon
|
icon: model.icon
|
||||||
width: 32
|
width: 32
|
||||||
height: 32
|
height: 32
|
||||||
state: index == listView.currentIndex ? QIconItem.ActiveState : QIconItem.DisabledState
|
state: index == listView.currentIndex ? QIconItem.ActiveState : QIconItem.DisabledState
|
||||||
anchors {
|
anchors {
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
left: parent.left
|
left: parent.left
|
||||||
leftMargin: hoverItem.margins.left
|
leftMargin: hoverItem.margins.left
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Text {
|
||||||
|
id: captionItem
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
text: listView.itemCaption(caption, minimized)
|
||||||
|
font.bold: true
|
||||||
|
font.italic: minimized
|
||||||
|
color: theme.textColor
|
||||||
|
elide: Text.ElideMiddle
|
||||||
|
anchors {
|
||||||
|
left: iconItem.right
|
||||||
|
right: parent.right
|
||||||
|
top: parent.top
|
||||||
|
topMargin: informativeTabBox.textMargin + hoverItem.margins.top
|
||||||
|
rightMargin: hoverItem.margins.right
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Text {
|
||||||
|
id: desktopNameItem
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
text: desktopName
|
||||||
|
font.bold: false
|
||||||
|
font.italic: true
|
||||||
|
color: theme.textColor
|
||||||
|
elide: Text.ElideMiddle
|
||||||
|
visible: tabBox.allDesktops
|
||||||
|
anchors {
|
||||||
|
left: iconItem.right
|
||||||
|
right: parent.right
|
||||||
|
top: captionItem.bottom
|
||||||
|
topMargin: informativeTabBox.textMargin
|
||||||
|
bottom: parent.bottom
|
||||||
|
bottomMargin: informativeTabBox.textMargin + hoverItem.margins.bottom
|
||||||
|
rightMargin: hoverItem.margins.right
|
||||||
|
}
|
||||||
|
}
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
onClicked: {
|
||||||
|
listView.currentIndex = index;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Text {
|
ListView {
|
||||||
id: captionItem
|
/**
|
||||||
horizontalAlignment: Text.AlignHCenter
|
* Returns the caption with adjustments for minimized items.
|
||||||
text: itemCaption(caption, minimized)
|
* @param caption the original caption
|
||||||
font.bold: true
|
* @param mimized whether the item is minimized
|
||||||
font.italic: minimized
|
* @return Caption adjusted for minimized state
|
||||||
color: theme.textColor
|
**/
|
||||||
elide: Text.ElideMiddle
|
function itemCaption(caption, minimized) {
|
||||||
anchors {
|
var text = caption;
|
||||||
left: iconItem.right
|
if (minimized) {
|
||||||
right: parent.right
|
text = "(" + text + ")";
|
||||||
top: parent.top
|
}
|
||||||
topMargin: informativeTabBox.textMargin + hoverItem.margins.top
|
return text;
|
||||||
rightMargin: hoverItem.margins.right
|
|
||||||
}
|
}
|
||||||
}
|
function calculateMaxRowWidth() {
|
||||||
Text {
|
var width = 0;
|
||||||
id: desktopNameItem
|
var textElement = Qt.createQmlObject(
|
||||||
horizontalAlignment: Text.AlignHCenter
|
'import QtQuick 2.0;'
|
||||||
text: desktopName
|
+ 'Text {\n'
|
||||||
font.bold: false
|
+ ' text: "' + listView.itemCaption(tabBox.model.longestCaption(), true) + '"\n'
|
||||||
font.italic: true
|
+ ' font.bold: true\n'
|
||||||
color: theme.textColor
|
+ ' visible: false\n'
|
||||||
elide: Text.ElideMiddle
|
+ '}',
|
||||||
visible: informativeTabBox.allDesktops
|
listView, "calculateMaxRowWidth");
|
||||||
anchors {
|
width = Math.max(textElement.width, width);
|
||||||
left: iconItem.right
|
textElement.destroy();
|
||||||
right: parent.right
|
return width + 32 + hoverItem.margins.right + hoverItem.margins.left;
|
||||||
top: captionItem.bottom
|
|
||||||
topMargin: informativeTabBox.textMargin
|
|
||||||
bottom: parent.bottom
|
|
||||||
bottomMargin: informativeTabBox.textMargin + hoverItem.margins.bottom
|
|
||||||
rightMargin: hoverItem.margins.right
|
|
||||||
}
|
}
|
||||||
}
|
/**
|
||||||
MouseArea {
|
* Calculates the height of one row based on the text height and icon size.
|
||||||
anchors.fill: parent
|
* @return Row height
|
||||||
onClicked: {
|
**/
|
||||||
listView.currentIndex = index;
|
function calcRowHeight() {
|
||||||
listView.currentIndexChanged(listView.currentIndex);
|
var textElement = Qt.createQmlObject(
|
||||||
|
'import QtQuick 2.0;'
|
||||||
|
+ 'Text {\n'
|
||||||
|
+ ' text: "Some Text"\n'
|
||||||
|
+ ' font.bold: true\n'
|
||||||
|
+ ' visible: false\n'
|
||||||
|
+ '}',
|
||||||
|
listView, "calcRowHeight");
|
||||||
|
var height = textElement.height;
|
||||||
|
textElement.destroy();
|
||||||
|
// icon size or two text elements and margins and hoverItem margins
|
||||||
|
return Math.max(32, height*2 + informativeTabBox.textMargin * 3 + hoverItem.margins.top + hoverItem.margins.bottom);
|
||||||
|
}
|
||||||
|
id: listView
|
||||||
|
model: tabBox.model
|
||||||
|
// the maximum text width + icon item width (32 + 4 margin) + margins for hover item + margins for background
|
||||||
|
property int maxRowWidth: calculateMaxRowWidth()
|
||||||
|
property int rowHeight: calcRowHeight()
|
||||||
|
anchors {
|
||||||
|
fill: parent
|
||||||
|
}
|
||||||
|
clip: true
|
||||||
|
delegate: listDelegate
|
||||||
|
highlight: PlasmaCore.FrameSvgItem {
|
||||||
|
id: highlightItem
|
||||||
|
imagePath: "widgets/viewitem"
|
||||||
|
prefix: "hover"
|
||||||
|
width: listView.width
|
||||||
|
}
|
||||||
|
highlightMoveDuration: 250
|
||||||
|
boundsBehavior: Flickable.StopAtBounds
|
||||||
|
Connections {
|
||||||
|
target: tabBox
|
||||||
|
onCurrentIndexChanged: {listView.currentIndex = tabBox.currentIndex;}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
/*
|
||||||
ListView {
|
* Key navigation on outer item for two reasons:
|
||||||
function calculateMaxRowWidth() {
|
* @li we have to emit the change signal
|
||||||
var width = 0;
|
* @li on multiple invocation it does not work on the list view. Focus seems to be lost.
|
||||||
var textElement = Qt.createQmlObject(
|
|
||||||
'import QtQuick 2.0;'
|
|
||||||
+ 'Text {\n'
|
|
||||||
+ ' text: "' + itemCaption(informativeTabBox.longestCaption, true) + '"\n'
|
|
||||||
+ ' font.bold: true\n'
|
|
||||||
+ ' visible: false\n'
|
|
||||||
+ '}',
|
|
||||||
listView, "calculateMaxRowWidth");
|
|
||||||
width = Math.max(textElement.width, width);
|
|
||||||
textElement.destroy();
|
|
||||||
return width + 32 + hoverItem.margins.right + hoverItem.margins.left + background.leftMargin + background.rightMargin;
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Calculates the height of one row based on the text height and icon size.
|
|
||||||
* @return Row height
|
|
||||||
**/
|
**/
|
||||||
function calcRowHeight() {
|
Keys.onPressed: {
|
||||||
var textElement = Qt.createQmlObject(
|
if (event.key == Qt.Key_Up) {
|
||||||
'import QtQuick 2.0;'
|
listView.decrementCurrentIndex();
|
||||||
+ 'Text {\n'
|
} else if (event.key == Qt.Key_Down) {
|
||||||
+ ' text: "Some Text"\n'
|
listView.incrementCurrentIndex();
|
||||||
+ ' font.bold: true\n'
|
}
|
||||||
+ ' visible: false\n'
|
|
||||||
+ '}',
|
|
||||||
listView, "calcRowHeight");
|
|
||||||
var height = textElement.height;
|
|
||||||
textElement.destroy();
|
|
||||||
// icon size or two text elements and margins and hoverItem margins
|
|
||||||
return Math.max(32, height*2 + informativeTabBox.textMargin * 3 + hoverItem.margins.top + hoverItem.margins.bottom);
|
|
||||||
}
|
|
||||||
signal currentIndexChanged(int index)
|
|
||||||
id: listView
|
|
||||||
objectName: "listView"
|
|
||||||
// the maximum text width + icon item width (32 + 4 margin) + margins for hover item + margins for background
|
|
||||||
property int maxRowWidth: calculateMaxRowWidth()
|
|
||||||
property int rowHeight: calcRowHeight()
|
|
||||||
anchors {
|
|
||||||
fill: parent
|
|
||||||
topMargin: background.topMargin
|
|
||||||
leftMargin: background.leftMargin
|
|
||||||
rightMargin: background.rightMargin
|
|
||||||
bottomMargin: background.bottomMargin
|
|
||||||
}
|
|
||||||
clip: true
|
|
||||||
delegate: listDelegate
|
|
||||||
highlight: PlasmaCore.FrameSvgItem {
|
|
||||||
id: highlightItem
|
|
||||||
imagePath: "widgets/viewitem"
|
|
||||||
prefix: "hover"
|
|
||||||
width: listView.width
|
|
||||||
}
|
|
||||||
highlightMoveDuration: 250
|
|
||||||
boundsBehavior: Flickable.StopAtBounds
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
* Key navigation on outer item for two reasons:
|
|
||||||
* @li we have to emit the change signal
|
|
||||||
* @li on multiple invocation it does not work on the list view. Focus seems to be lost.
|
|
||||||
**/
|
|
||||||
Keys.onPressed: {
|
|
||||||
if (event.key == Qt.Key_Up) {
|
|
||||||
listView.decrementCurrentIndex();
|
|
||||||
listView.currentIndexChanged(listView.currentIndex);
|
|
||||||
} else if (event.key == Qt.Key_Down) {
|
|
||||||
listView.incrementCurrentIndex();
|
|
||||||
listView.currentIndexChanged(listView.currentIndex);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue