alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git://anongit.kde.org/kde-runtime

Browse Source
This commit is contained in:
Gregor Tätzner 2012-08-10 19:31:42 +02:00
commit 91e67c8304
15 changed files with 73 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
declarativeimports/locale/locale_p.h
View File

@ -87,6 +87,7 @@ Q_PROPERTY(QString currencyCode READ currencyCode WRITE setCurrencyCode NOTIFY c
Q_PROPERTY(QString currencySymbol READ currencySymbol WRITE setCurrencySymbol NOTIFY currencySymbolChanged)
Q_PROPERTY(QString dateFormat READ dateFormat WRITE setDateFormat NOTIFY dateFormatChanged)
Q_PROPERTY(QString dateFormatShort READ dateFormatShort WRITE setDateFormat NOTIFY dateFormatShortChanged)
Q_PROPERTY(QString timeFormat READ timeFormat WRITE setTimeFormat NOTIFY timeFormatChanged)
Q_PROPERTY(bool dateMonthNamePossessive READ dateMonthNamePossessive WRITE setDateMonthNamePossessive NOTIFY dateMonthNamePossessiveChanged)
Q_PROPERTY(DigitSet dateTimeDigitSet READ dateTimeDigitSet WRITE setDateTimeDigitSet NOTIFY dateTimeDigitSetChanged)
Q_PROPERTY(int decimalPlaces READ decimalPlaces WRITE setDecimalPlaces NOTIFY decimalPlacesChanged)

1
declarativeimports/plasmacomponents/fullscreenwindow.cpp
View File

@ -78,6 +78,7 @@ public:
void mouseReleaseEvent(QMouseEvent *event)
{
if (!m_dialog->view()->geometry().contains(event->globalPos())) {
emit m_dialog->clickedOutside();
m_dialog->close();
}
}

1
declarativeimports/plasmacomponents/fullscreenwindow.h
View File

@ -96,6 +96,7 @@ private:
QList<QGraphicsObject *> m_dummyTitleElements;
QList<QGraphicsObject *> m_dummyContentElements;
QList<QGraphicsObject *> m_dummyButtonsElements;
friend class Background;
};
#endif

20
declarativeimports/plasmacomponents/platformcomponents/touch/private/Config.js Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright (C) 2012 Marco Martin <mart@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, 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 Library General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
var mouseOverEnabled = false

4
declarativeimports/plasmacomponents/qml/ListItem.qml
View File

@ -51,6 +51,7 @@ Signals:
import QtQuick 1.0
import org.kde.plasma.core 0.1 as PlasmaCore
import "private/Config.js" as Config
Item {
id: listItem
@ -86,9 +87,11 @@ Item {
prefix: "normal"
anchors.fill: parent
opacity: itemMouse.containsMouse && !itemMouse.pressed ? 0.5 : 1
Component.onCompleted: {
prefix = (listItem.sectionDelegate ? "section" : (listItem.checked ? "pressed" : "normal"))
}
Behavior on opacity { NumberAnimation { duration: 200 } }
}
PlasmaCore.SvgItem {
svg: PlasmaCore.Svg {imagePath: "widgets/listitem"}
@ -107,6 +110,7 @@ Item {
property bool changeBackgroundOnPress: !listItem.checked && !listItem.sectionDelegate
anchors.fill: background
enabled: false
hoverEnabled: Config.mouseOverEnabled
onClicked: listItem.clicked()
onPressAndHold: listItem.pressAndHold()

18
declarativeimports/plasmacomponents/qml/ProgressBar.qml
View File

@ -87,6 +87,7 @@ Item {
id: contents
property bool _isVertical: orientation == Qt.Vertical
property int _tileWidth: width
width: _isVertical ? progressBar.height : progressBar.width
height: _isVertical ? progressBar.width : progressBar.height
@ -99,17 +100,20 @@ Item {
interval: 0
running: false
onTriggered: {
contents._tileWidth = Math.floor(contents.width/(Math.floor(contents.width/(contents.height/1.6))))
if (barFrameSvg.hasElement("hint-bar-stretch")) {
barFrameSvg.resizeFrame(Qt.size(barPixmapItem.width, barPixmapItem.height))
} else {
barFrameSvg.resizeFrame(Qt.size(Math.floor(contents.height/1.6), contents.height))
barFrameSvg.resizeFrame(Qt.size(contents._tileWidth, contents.height))
}
barPixmapItem.pixmap = barFrameSvg.framePixmap()
if (backgroundFrameSvg.hasElement("hint-bar-stretch")) {
backgroundFrameSvg.resizeFrame(Qt.size(backgroundPixmapItem.width, backgroundPixmapItem.height))
} else {
backgroundFrameSvg.resizeFrame(Qt.size(Math.floor(contents.height/1.6), contents.height))
backgroundFrameSvg.resizeFrame(Qt.size(contents._tileWidth, contents.height))
}
backgroundPixmapItem.pixmap = backgroundFrameSvg.framePixmap()
}
@ -132,9 +136,8 @@ Item {
}
QPixmapItem {
id: backgroundPixmapItem
fillMode: QPixmapItem.Tile
width: Math.floor(parent.width/(height/1.6))*Math.floor(height/1.6)
height: parent.height
anchors.fill: parent
fillMode: QPixmapItem.TileHorizontally
onWidthChanged: resizeTimer.restart()
onHeightChanged: resizeTimer.restart()
}
@ -142,11 +145,12 @@ Item {
QPixmapItem {
id: barPixmapItem
fillMode: QPixmapItem.Tile
width: indeterminate ? Math.floor(height/1.6)*2 : range.position
fillMode: QPixmapItem.TileHorizontally
width: indeterminate ? contents._tileWidth*2 : range.position
height: contents.height
visible: indeterminate || value > 0
onWidthChanged: resizeTimer.restart()
SequentialAnimation {
id: indeterminateAnimation

20
declarativeimports/plasmacomponents/qml/private/Config.js Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright (C) 2012 Marco Martin <mart@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, 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 Library General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
var mouseOverEnabled = true

1
declarativeimports/plasmaextracomponents/qml/ScrollArea.qml
View File

@ -44,6 +44,7 @@ Item {
property Flickable flickableItem
//FIXME: this alias seems necessary for it to correctly parse
default property alias flickableItemDefault: root.flickableItem
clip: true
Connections {
target: root

1
kpart/plasma-kpart.desktop
View File

@ -2,6 +2,7 @@
Name=plasma-kpart
Name[ast]=plasma-kpart
Name[bg]=plasma-kpart
Name[bn]=প্লাসমা কে-পার্ট
Name[bs]=plasma-kpart
Name[ca]=plasma-kpart
Name[ca@valencia]=plasma-kpart

2
scriptengines/javascript/data/plasma-javascriptaddon.desktop
View File

@ -15,7 +15,7 @@ Name[es]=Complemento de JavaScript para Plasma
Name[et]=Plasma JavaScripti lisa
Name[eu]=Plasma JavaScript gehigarria
Name[fa]=افزودنی جاوااسکریپت پلاسما
Name[fi]=Plasma JavaScript -lisäosa
Name[fi]=Plasma JavaScript -liitännäinen
Name[fr]=Module complémentaire Javascript de Plasma
Name[ga]=Breiseán JavaScript Plasma
Name[gl]=Engadido JavaScript para Plasma

3
scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop
View File

@ -2,6 +2,7 @@
Name=Javascript Addon
Name[ast]=Complementu de JavaScript
Name[bg]=Добавка за Javascript
Name[bn]=জাভাস্ক্রিপ্ট অ্যাড-অন
Name[bs]=Javaskriptni dodatak
Name[ca]=Complement del Javascript
Name[ca@valencia]=Complement del Javascript
@ -15,7 +16,7 @@ Name[es]=Complemento de JavaScript
Name[et]=JavaScripti lisa
Name[eu]=Javascript gehigarria
Name[fa]=افزودنی جاوااسکریپت
Name[fi]=Javascript-lisäosa
Name[fi]=Javascript-liitännäinen
Name[fr]=Module complémentaire Javascript
Name[ga]=Breiseán JavaScript
Name[gl]=Engadido JavaScript

1
scriptengines/javascript/data/plasma-scriptengine-applet-simple-javascript.desktop
View File

@ -4,6 +4,7 @@ Name[ar]=ودجة جافا سكربت
Name[ast]=Elementu gráficu JavaScript
Name[be@latin]=Widžet „JavaScript”
Name[bg]=Джаджа JavaScript
Name[bn]=জাভাস্ক্রিপ্ট উইজেট
Name[bn_IN]=JavaScript Widget
Name[bs]=Javascript grafička kontrola
Name[ca]=Estri del JavaScript

1
scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop
View File

@ -3,6 +3,7 @@ Name=JavaScript DataEngine
Name[ar]=مشغل جافا سكربت
Name[ast]=Motor de datos JavaScript
Name[bg]=Ядро за данни на JavaScript
Name[bn]=জাভাস্ক্রিপ্ট ডেটা-ইঞ্জিন
Name[bs]=Javascript pogon podataka
Name[ca]=Motor de dades de JavaScript
Name[ca@valencia]=Motor de dades de JavaScript

2
scriptengines/javascript/data/plasma-scriptengine-runner-javascript.desktop
View File

@ -4,6 +4,7 @@ Name[ar]=مشغل جافا سكربت
Name[ast]=Motor de javascript
Name[be@latin]=Uklučeńnie „JavaScript”
Name[bg]=Изпълнение на JavaScript
Name[bn]=জাভাস্ক্রিপ্ট রানার
Name[bn_IN]=JavaScript Runner
Name[bs]=Javascript izvođač
Name[ca]=Executor de JavaScript
@ -81,6 +82,7 @@ Comment[ar]=مشغل جافا سكربت
Comment[ast]=Motor de javascript
Comment[be@latin]=Uklučeńnie „JavaScript”.
Comment[bg]=Изпълнение на JavaScript
Comment[bn]=জাভাস্ক্রিপ্ট চালক
Comment[bn_IN]=JavaScript Runner
Comment[bs]=Javascript izvođač
Comment[ca]=Executor de JavaScript

6
scriptengines/javascript/plasmoid/appletinterface.cpp
View File

@ -51,6 +51,12 @@ AppletInterface::AppletInterface(AbstractJsAppletScript *parent)
connect(this, SIGNAL(configNeedsSaving()), applet(), SIGNAL(configNeedsSaving()));
connect(applet(), SIGNAL(immutabilityChanged(Plasma::ImmutabilityType)), this, SIGNAL(immutableChanged()));
connect(applet(), SIGNAL(newStatus(Plasma::ItemStatus)), this, SIGNAL(statusChanged()));
connect(m_appletScriptEngine, SIGNAL(formFactorChanged()),
this, SIGNAL(formFactorChanged()));
connect(m_appletScriptEngine, SIGNAL(locationChanged()),
this, SIGNAL(locationChanged()));
connect(m_appletScriptEngine, SIGNAL(contextChanged()),
this, SIGNAL(contextChanged()));
}
AppletInterface::~AppletInterface()