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

qtextracomponents->kquickcontrolsaddons

Browse Source
This commit is contained in:
Marco Martin 2014-03-25 17:10:25 +01:00
parent c8844799eb
commit 91642b0868
25 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/applets/testcomponents/contents/ui/ButtonsPage.qml
View File

@ -21,7 +21,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// ButtonsPage // ButtonsPage

2
examples/applets/testcomponents/contents/ui/DialogContent.qml
View File

@ -22,7 +22,7 @@ import QtQuick.Window 2.0
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// DialogContent // DialogContent

2
examples/applets/testcomponents/contents/ui/DialogsPage.qml
View File

@ -22,7 +22,7 @@ import QtQuick.Window 2.0
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// DialogsPage // DialogsPage

2
examples/applets/testcomponents/contents/ui/DragItem.qml
View File

@ -21,7 +21,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
import org.kde.draganddrop 2.0 as DragAndDrop import org.kde.draganddrop 2.0 as DragAndDrop

2
examples/applets/testcomponents/contents/ui/DragPage.qml
View File

@ -21,7 +21,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
import org.kde.draganddrop 2.0 as DragAndDrop import org.kde.draganddrop 2.0 as DragAndDrop

4
examples/applets/testcomponents/contents/ui/IconsPage.qml
View File

@ -21,7 +21,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// IconTab // IconTab
@ -77,7 +77,7 @@ PlasmaComponents.Page {
width: _h width: _h
height: width height: width
} }
QtExtras.QIconItem { KQuickControlsAddons.QIconItem {
icon: "preferences-desktop-icons" icon: "preferences-desktop-icons"
width: _h width: _h
height: width height: width

4
examples/applets/testcomponents/contents/ui/MousePage.qml
View File

@ -21,7 +21,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// MousePage // MousePage
@ -36,7 +36,7 @@ PlasmaComponents.Page {
text: "MouseEventListener" text: "MouseEventListener"
anchors { left: parent.left; right: parent.right; top: parent.top } anchors { left: parent.left; right: parent.right; top: parent.top }
} }
QtExtras.MouseEventListener { KQuickControlsAddons.MouseEventListener {
id: mel id: mel
hoverEnabled: true hoverEnabled: true
anchors { left: parent.left; right: parent.right; top: mellabel.bottom; bottom: parent.bottom; } anchors { left: parent.left; right: parent.right; top: mellabel.bottom; bottom: parent.bottom; }

2
examples/applets/testcomponents/contents/ui/PlasmoidPage.qml
View File

@ -20,7 +20,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// PlasmoidPage // PlasmoidPage

2
examples/applets/testcomponents/contents/ui/TestMenu.qml
View File

@ -20,7 +20,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// PlasmoidPage // PlasmoidPage

2
examples/applets/testcomponents/contents/ui/ThemePage.qml
View File

@ -21,7 +21,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// IconTab // IconTab

2
examples/applets/testcomponents/contents/ui/testcomponents.qml
View File

@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
Item { Item {
id: root id: root

2
examples/applets/testshaders/contents/ui/EditorPage.qml
View File

@ -21,7 +21,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// ButtonsPage // ButtonsPage

2
examples/applets/testshaders/contents/ui/ShaderExample.qml
View File

@ -21,7 +21,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// VertexPage // VertexPage

2
examples/applets/testshaders/contents/ui/WaterEffect.qml
View File

@ -21,7 +21,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// VertexPage // VertexPage

2
examples/applets/testshaders/contents/ui/testshaderapplet.qml
View File

@ -21,7 +21,7 @@ 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.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
Item { Item {
id: root id: root

4
examples/applets/testtheme/contents/ui/ScalePage.qml
View File

@ -21,7 +21,7 @@ import QtQuick 2.1
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
Item { Item {
@ -125,7 +125,7 @@ Item {
width: units.iconSizes.huge width: units.iconSizes.huge
height: width height: width
} }
// QtExtras.QIconItem { // KQuickControlsAddons.QIconItem {
// icon: "preferences-desktop-icons" // icon: "preferences-desktop-icons"
// width: units.iconSizes.enormous // width: units.iconSizes.enormous
// height: width // height: width

2
examples/applets/testtheme/contents/ui/UnitsPage.qml
View File

@ -21,7 +21,7 @@ import QtQuick 2.1
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
// IconTab // IconTab

2
examples/applets/testtheme/contents/ui/testtheme.qml
View File

@ -22,7 +22,7 @@ import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
// import org.kde.plasma.extras 2.0 as PlasmaExtras // import org.kde.plasma.extras 2.0 as PlasmaExtras
// import org.kde.qtextracomponents 2.0 as QtExtras // import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
Item { Item {
id: root id: root

2
src/declarativeimports/core/private/DefaultToolTip.qml
View File

@ -22,7 +22,7 @@ import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.qtextracomponents 2.0 as QtExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons

2
src/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml
View File

@ -19,7 +19,7 @@
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.kquickcontrolsaddons 2.0
PlasmaCore.FrameSvgItem { PlasmaCore.FrameSvgItem {
id: editBubble id: editBubble

2
src/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml
View File

@ -19,7 +19,7 @@
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.kquickcontrolsaddons 2.0
import "EditBubble.js" as EditBubbleHelper import "EditBubble.js" as EditBubbleHelper
Item { Item {

2
src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml
View File

@ -19,7 +19,7 @@
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.kquickcontrolsaddons 2.0
import "EditBubble.js" as EditBubbleHelper import "EditBubble.js" as EditBubbleHelper
Item { Item {

2
src/declarativeimports/plasmacomponents/qml/ProgressBar.qml
View File

@ -20,7 +20,7 @@
import QtQuick 2.1 import QtQuick 2.1
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.qtextracomponents 2.0 import org.kde.kquickcontrolsaddons 2.0
/** /**
* Simple progressBar using the plasma theme. * Simple progressBar using the plasma theme.

2
src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
View File

@ -55,7 +55,7 @@ Properties:
**/ **/
import QtQuick 2.1 import QtQuick 2.1
import org.kde.qtextracomponents 2.0 import org.kde.kquickcontrolsaddons 2.0
import "AppManager.js" as Utils import "AppManager.js" as Utils
Item { Item {

12
tools/port-plasma2.sh
View File

@ -154,3 +154,15 @@ for FS in `find $PWD -type f -name '*main.qml'`; do
perl -p -i -e 's/QtQuick 2.0/QtQuick 2.0\nimport org.kde.plasma.plasmoid 2.0/g' $FS perl -p -i -e 's/QtQuick 2.0/QtQuick 2.0\nimport org.kde.plasma.plasmoid 2.0/g' $FS
done done
for FS in `find $PWD -name '*.qml'`; do
perl -p -i -e 's/org.kde.qtextracomponents/org.kde.kquickcontrolsaddons/g' $FS
done
for FS in `find $PWD -name '*.qml'`; do
perl -p -i -e 's/QtExtras/KQuickControlsAddons/g' $FS
done
for FS in `find $PWD -name '*.qml'`; do
perl -p -i -e 's/QtExtra/KQuickControlsAddons/g' $FS
done