yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/KDE/4.10'

Browse source 
Conflicts [scripty translations]:
	plasma/generic/applets/batterymonitor/metadata.desktop
	plasma/generic/applets/lock_logout/metadata.desktop
This commit is contained in:
Luca Beltrame 2013-02-15 00:04:53 +01:00
commit 2209b4851a
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tabbox/qml/clients/compact/contents/ui/main.qml
View file

@ -142,7 +142,7 @@ Item {
function calculateMaxRowWidth() {
var width = 0;
var textElement = Qt.createQmlObject(
'import Qt 4.7;'
'import QtQuick 1.0;'
+ 'Text {\n'
+ ' text: "' + itemCaption(compactTabBox.longestCaption, true) + '"\n'
+ ' font.bold: true\n'
@ -159,7 +159,7 @@ Item {
**/
function calcRowHeight() {
var textElement = Qt.createQmlObject(
'import Qt 4.7;'
'import QtQuick 1.0;'
+ 'Text {\n'
+ ' text: "Some Text"\n'
+ ' font.bold: true\n'

6
tabbox/qml/clients/informative/contents/ui/main.qml
View file

@ -158,7 +158,7 @@ Item {
function calculateMaxRowWidth() {
var width = 0;
var textElement = Qt.createQmlObject(
'import Qt 4.7;'
'import QtQuick 1.0;'
+ 'Text {\n'
+ ' text: "' + itemCaption(informativeTabBox.longestCaption, true) + '"\n'
+ ' font.bold: true\n'
@ -167,7 +167,7 @@ Item {
listView, "calculateMaxRowWidth");
width = Math.max(textElement.width, width);
textElement.destroy();
return width + 32 + hoverItem.margins.right + hoverItem.margins.left + background.leftMargin + background.right;Margin
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.
@ -175,7 +175,7 @@ Item {
**/
function calcRowHeight() {
var textElement = Qt.createQmlObject(
'import Qt 4.7;'
'import QtQuick 1.0;'
+ 'Text {\n'
+ ' text: "Some Text"\n'
+ ' font.bold: true\n'

6
tabbox/qml/clients/text/contents/ui/main.qml
View file

@ -109,7 +109,7 @@ Item {
function calculateMaxRowWidth() {
var width = 0;
var textElement = Qt.createQmlObject(
'import Qt 4.7;'
'import QtQuick 1.0;'
+ 'Text {\n'
+ ' text: "' + textTabBox.longestCaption + '"\n'
+ ' visible: false\n'
@ -117,7 +117,7 @@ Item {
textListView, "calculateMaxRowWidth");
width = Math.max(textElement.width, width);
textElement.destroy();
return width + hoverItem.margins.right + hoverItem.margins.left + background.leftMargin + background.right;Margin
return width + hoverItem.margins.right + hoverItem.margins.left + background.leftMargin + background.rightMargin;
}
/**
* Calculates the height of one row based on the text height and icon size.
@ -125,7 +125,7 @@ Item {
**/
function calcRowHeight() {
var textElement = Qt.createQmlObject(
'import Qt 4.7;'
'import QtQuick 1.0;'
+ 'Text {\n'
+ ' text: "Some Text"\n'
+ ' visible: false\n'

4
tabbox/qml/desktop.qml
View file

@ -115,7 +115,7 @@ Item {
function calculateMaxRowWidth() {
var width = 0;
var textElement = Qt.createQmlObject(
'import Qt 4.7;'
'import QtQuick 1.0;'
+ 'Text {\n'
+ ' text: "' + desktopTabBox.longestCaption + '"\n'
+ ' font.bold: true\n'
@ -132,7 +132,7 @@ Item {
**/
function calcRowHeight() {
var textElement = Qt.createQmlObject(
'import Qt 4.7;'
'import QtQuick 1.0;'
+ 'Text {\n'
+ ' text: "Some Text"\n'
+ ' font.bold: true\n'