fix the names from the imports
This commit is contained in:
parent
bcc26fb73b
commit
986becb8fa
|
@ -61,6 +61,7 @@ install(FILES qml/ToolBar.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/
|
||||||
|
|
||||||
#Now install the private stuff!
|
#Now install the private stuff!
|
||||||
install(FILES qml/private/ButtonShadow.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
install(FILES qml/private/ButtonShadow.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
||||||
|
install(FILES qml/private/RoundShadow.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
||||||
install(FILES qml/private/DualStateButton.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
install(FILES qml/private/DualStateButton.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
||||||
install(FILES qml/private/IconLoader.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
install(FILES qml/private/IconLoader.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
||||||
install(FILES qml/private/PageStack.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
install(FILES qml/private/PageStack.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
||||||
|
@ -70,6 +71,7 @@ install(FILES qml/private/ScrollDecoratorDelegate.qml DESTINATION ${PLUGIN_INSTA
|
||||||
install(FILES qml/private/SectionScroller.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
install(FILES qml/private/SectionScroller.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
||||||
install(FILES qml/private/AppManager.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
install(FILES qml/private/AppManager.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
||||||
install(FILES qml/private/TabBarLayout.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
install(FILES qml/private/TabBarLayout.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
||||||
|
install(FILES qml/private/TextFieldFocus.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
||||||
|
|
||||||
#install platform overrides
|
#install platform overrides
|
||||||
install(DIRECTORY platformcomponents/touch/ DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
install(DIRECTORY platformcomponents/touch/ DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
||||||
|
|
|
@ -1,302 +0,0 @@
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/CMakeLists.txt b/plasma/declarativeimports/plasmacomponents/CMakeLists.txt
|
|
||||||
index 8af2dfa..ff28b09 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/CMakeLists.txt
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/CMakeLists.txt
|
|
||||||
@@ -32,8 +32,6 @@ install(DIRECTORY qml/ DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/plasma/compone
|
|
||||||
|
|
||||||
install(TARGETS plasmacomponentsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
|
|
||||||
-
|
|
||||||
-install(FILES qml/AppManager.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/BusyIndicator.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/ButtonColumn.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/ButtonGroup.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
@@ -42,26 +40,18 @@ install(FILES qml/ButtonRow.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimport
|
|
||||||
install(FILES qml/CheckBox.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/CommonDialog.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/Dialog.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
-install(FILES qml/DualStateButton.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/Highlight.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
-install(FILES qml/IconLoader.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/Label.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/ListItem.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/Page.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
-install(FILES qml/PageStack.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/PageStack.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/ProgressBar.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/RadioButton.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
-install(FILES qml/ScrollBarDelegate.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
-install(FILES qml/ScrollDecoratorDelegate.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
-install(FILES qml/SectionScroller.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/SelectionDialog.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/Slider.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/Switch.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
-install(FILES qml/TabBarLayout.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/TabBar.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/TabButton.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
-install(FILES qml/TabGroup.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/TabGroup.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/TextArea.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
install(FILES qml/TextField.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
@@ -69,5 +59,16 @@ install(FILES qml/ToolBarLayout.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformim
|
|
||||||
install(FILES qml/ToolBar.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
|
|
||||||
|
|
||||||
+#Now install the private stuff!
|
|
||||||
+install(FILES qml/private/DualStateButton.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
|
||||||
+install(FILES qml/private/IconLoader.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
|
||||||
+install(FILES qml/private/PageStack.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
|
||||||
+install(FILES qml/private/TabGroup.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
|
||||||
+install(FILES qml/private/ScrollBarDelegate.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
|
||||||
+install(FILES qml/private/ScrollDecoratorDelegate.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
|
||||||
+install(FILES qml/private/SectionScroller.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
|
||||||
+install(FILES qml/private/AppManager.js DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
|
||||||
+install(FILES qml/private/TabBarLayout.qml DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components/private)
|
|
||||||
+
|
|
||||||
#install platform overrides
|
|
||||||
install(DIRECTORY platformcomponents/touch/ DESTINATION ${PLUGIN_INSTALL_DIR}/platformimports/touch/org/kde/plasma/components)
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml b/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml
|
|
||||||
index ccb8ac4..25c7e08 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/ScrollBar.qml
|
|
||||||
@@ -20,6 +20,7 @@
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
@@ -52,7 +53,7 @@ Item {
|
|
||||||
|
|
||||||
anchors {
|
|
||||||
right: flickableItem.right
|
|
||||||
- left: (orientation == Qt.Vertical) ? undefined : flickableItem.left
|
|
||||||
+ left: (orientation == Qt.Vertical) ? undefined : flickableItem.left
|
|
||||||
top: (orientation == Qt.Vertical) ? flickableItem.top : undefined
|
|
||||||
bottom: flickableItem.bottom
|
|
||||||
}
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml b/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
|
|
||||||
index ef66cfc..1095668 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
|
|
||||||
@@ -20,6 +20,7 @@
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
Item {
|
|
||||||
id: button
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/qmldir b/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/qmldir
|
|
||||||
index d523958..463f326 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/qmldir
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/qmldir
|
|
||||||
@@ -17,7 +17,6 @@ MenuItem 0.1 MenuItem.qml
|
|
||||||
Page 0.1 Page.qml
|
|
||||||
PageStack 0.1 PageStack.qml
|
|
||||||
ProgressBar 0.1 ProgressBar.qml
|
|
||||||
-PushButton 0.1 PushButton.qml
|
|
||||||
QueryDialog 0.1 QueryDialog.qml
|
|
||||||
RadioButton 0.1 RadioButton.qml
|
|
||||||
ScrollBar 0.1 ScrollBar.qml
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/Button.qml b/plasma/declarativeimports/plasmacomponents/qml/Button.qml
|
|
||||||
index f37c303..48611bf 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/Button.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/Button.qml
|
|
||||||
@@ -71,6 +71,7 @@ Signals:
|
|
||||||
import QtQuick 1.1
|
|
||||||
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
Item {
|
|
||||||
id: button
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/CheckBox.qml b/plasma/declarativeimports/plasmacomponents/qml/CheckBox.qml
|
|
||||||
index f077ae0..689f993 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/CheckBox.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/CheckBox.qml
|
|
||||||
@@ -32,6 +32,7 @@ Properties:
|
|
||||||
|
|
||||||
import QtQuick 1.0
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
DualStateButton {
|
|
||||||
id: checkBox
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/CommonDialog.qml b/plasma/declarativeimports/plasmacomponents/qml/CommonDialog.qml
|
|
||||||
index b9c1501..3e706ba 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/CommonDialog.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/CommonDialog.qml
|
|
||||||
@@ -42,6 +42,7 @@
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
+import "private" as Private
|
|
||||||
import "." 0.1
|
|
||||||
|
|
||||||
Dialog {
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/Dialog.qml b/plasma/declarativeimports/plasmacomponents/qml/Dialog.qml
|
|
||||||
index 8045914..1cd66cb 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/Dialog.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/Dialog.qml
|
|
||||||
@@ -42,7 +42,7 @@
|
|
||||||
|
|
||||||
import QtQuick 1.0
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
-import "AppManager.js" as Utils
|
|
||||||
+import "private/AppManager.js" as Utils
|
|
||||||
import "." 0.1
|
|
||||||
|
|
||||||
Item {
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/PageStack.qml b/plasma/declarativeimports/plasmacomponents/qml/PageStack.qml
|
|
||||||
index 0c66d1c..0f742e6 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/PageStack.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/PageStack.qml
|
|
||||||
@@ -106,7 +106,7 @@ Methods:
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
import "." 0.1
|
|
||||||
-import "PageStack.js" as Engine
|
|
||||||
+import "private/PageStack.js" as Engine
|
|
||||||
|
|
||||||
Item {
|
|
||||||
id: root
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/RadioButton.qml b/plasma/declarativeimports/plasmacomponents/qml/RadioButton.qml
|
|
||||||
index bd80b83..2ffeb9f 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/RadioButton.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/RadioButton.qml
|
|
||||||
@@ -33,7 +33,7 @@ Description:
|
|
||||||
|
|
||||||
import QtQuick 1.0
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
-
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
//FIXME: this should be round, DualStateButton shouldn't draw the shadow
|
|
||||||
DualStateButton {
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml b/plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml
|
|
||||||
index ba84605..9018c66 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml
|
|
||||||
@@ -61,7 +61,7 @@ Properties:
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
-
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A generic ScrollBar/ScrollDecorator component:
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/SectionScroller.qml b/plasma/declarativeimports/plasmacomponents/qml/SectionScroller.qml
|
|
||||||
index c81b735..12bbbcf 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/SectionScroller.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/SectionScroller.qml
|
|
||||||
@@ -62,7 +62,7 @@ Properties:
|
|
||||||
**/
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
-import "SectionScroller.js" as Sections
|
|
||||||
+import "private/SectionScroller.js" as Sections
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
|
|
||||||
Item {
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/Slider.qml b/plasma/declarativeimports/plasmacomponents/qml/Slider.qml
|
|
||||||
index 3eb2657..33982a9 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/Slider.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/Slider.qml
|
|
||||||
@@ -85,6 +85,7 @@ Plasma Properties:
|
|
||||||
|
|
||||||
import QtQuick 1.0
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
// TODO: create a value indicator for plasma?
|
|
||||||
Item {
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/TabBar.qml b/plasma/declarativeimports/plasmacomponents/qml/TabBar.qml
|
|
||||||
index dbcd496..5eae5f4 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/TabBar.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/TabBar.qml
|
|
||||||
@@ -62,6 +62,7 @@ Properties:
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
Item {
|
|
||||||
id: root
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/TabButton.qml b/plasma/declarativeimports/plasmacomponents/qml/TabButton.qml
|
|
||||||
index d49926d..a04a2b2 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/TabButton.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/TabButton.qml
|
|
||||||
@@ -72,7 +72,8 @@ Signals:
|
|
||||||
**/
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
-import "AppManager.js" as Utils
|
|
||||||
+import "private/AppManager.js" as Utils
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
Item {
|
|
||||||
id: root
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/TabGroup.qml b/plasma/declarativeimports/plasmacomponents/qml/TabGroup.qml
|
|
||||||
index 1c7ab0e..7f60220 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/TabGroup.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/TabGroup.qml
|
|
||||||
@@ -57,7 +57,7 @@ Properties:
|
|
||||||
**/
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
-import "TabGroup.js" as Engine
|
|
||||||
+import "private/TabGroup.js" as Engine
|
|
||||||
|
|
||||||
import "." 0.1
|
|
||||||
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/TextArea.qml b/plasma/declarativeimports/plasmacomponents/qml/TextArea.qml
|
|
||||||
index 66ff1f5..0bc2a06 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/TextArea.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/TextArea.qml
|
|
||||||
@@ -108,6 +108,7 @@ Properties:
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
Item {
|
|
||||||
id: textArea
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/TextField.qml b/plasma/declarativeimports/plasmacomponents/qml/TextField.qml
|
|
||||||
index f9a15cf..e60605c 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/TextField.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/TextField.qml
|
|
||||||
@@ -97,6 +97,7 @@ Properties:
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
Item {
|
|
||||||
id: textField
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/ToolButton.qml b/plasma/declarativeimports/plasmacomponents/qml/ToolButton.qml
|
|
||||||
index 09e6bdc..cf56c2d 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/ToolButton.qml
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/ToolButton.qml
|
|
||||||
@@ -57,6 +57,7 @@ Signals:
|
|
||||||
|
|
||||||
import QtQuick 1.1
|
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
|
||||||
+import "private" as Private
|
|
||||||
|
|
||||||
Item {
|
|
||||||
id: button
|
|
||||||
diff --git a/plasma/declarativeimports/plasmacomponents/qml/qmldir b/plasma/declarativeimports/plasmacomponents/qml/qmldir
|
|
||||||
index 026feec..c561998 100644
|
|
||||||
--- a/plasma/declarativeimports/plasmacomponents/qml/qmldir
|
|
||||||
+++ b/plasma/declarativeimports/plasmacomponents/qml/qmldir
|
|
||||||
@@ -15,7 +15,6 @@ ListItem 0.1 ListItem.qml
|
|
||||||
Page 0.1 Page.qml
|
|
||||||
PageStack 0.1 PageStack.qml
|
|
||||||
ProgressBar 0.1 ProgressBar.qml
|
|
||||||
-PushButton 0.1 PushButton.qml
|
|
||||||
RadioButton 0.1 RadioButton.qml
|
|
||||||
ScrollBar 0.1 ScrollBar.qml
|
|
||||||
SectionScroller 0.1 SectionScroller.qml
|
|
|
@ -144,7 +144,7 @@ Item {
|
||||||
property int right: 8
|
property int right: 8
|
||||||
property int bottom: 8
|
property int bottom: 8
|
||||||
}
|
}
|
||||||
RoundShadow {
|
Private.RoundShadow {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
state: (internal.userPressed || checked) ? "hidden" : "shadow"
|
state: (internal.userPressed || checked) ? "hidden" : "shadow"
|
||||||
}
|
}
|
||||||
|
@ -177,7 +177,7 @@ Item {
|
||||||
PropertyAnimation { duration: 100 }
|
PropertyAnimation { duration: 100 }
|
||||||
}
|
}
|
||||||
|
|
||||||
IconLoader {
|
Private.IconLoader {
|
||||||
id: icon
|
id: icon
|
||||||
|
|
||||||
anchors {
|
anchors {
|
||||||
|
|
|
@ -34,7 +34,7 @@ import QtQuick 1.0
|
||||||
import org.kde.plasma.core 0.1 as PlasmaCore
|
import org.kde.plasma.core 0.1 as PlasmaCore
|
||||||
import "private" as Private
|
import "private" as Private
|
||||||
|
|
||||||
DualStateButton {
|
Private.DualStateButton {
|
||||||
id: checkBox
|
id: checkBox
|
||||||
view: PlasmaCore.FrameSvgItem {
|
view: PlasmaCore.FrameSvgItem {
|
||||||
imagePath: "widgets/button"
|
imagePath: "widgets/button"
|
||||||
|
|
|
@ -131,7 +131,7 @@ Dialog {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
IconLoader {
|
Private.IconLoader {
|
||||||
id: titleAreaIcon
|
id: titleAreaIcon
|
||||||
width: theme.iconSizeSmall
|
width: theme.iconSizeSmall
|
||||||
height: theme.iconSizeSmall
|
height: theme.iconSizeSmall
|
||||||
|
|
|
@ -36,7 +36,7 @@ import org.kde.plasma.core 0.1 as PlasmaCore
|
||||||
import "private" as Private
|
import "private" as Private
|
||||||
|
|
||||||
//FIXME: this should be round, DualStateButton shouldn't draw the shadow
|
//FIXME: this should be round, DualStateButton shouldn't draw the shadow
|
||||||
DualStateButton {
|
Private.DualStateButton {
|
||||||
id: radioButton
|
id: radioButton
|
||||||
view: PlasmaCore.SvgItem {
|
view: PlasmaCore.SvgItem {
|
||||||
svg: PlasmaCore.Svg {
|
svg: PlasmaCore.Svg {
|
||||||
|
|
|
@ -172,6 +172,6 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
source: interactive ? "ScrollBarDelegate.qml" : "ScrollDecoratorDelegate.qml"
|
source: interactive ? "private/ScrollBarDelegate.qml" : "private/ScrollDecoratorDelegate.qml"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -210,7 +210,7 @@ Item {
|
||||||
visible: range.position > 0 && slider.enabled
|
visible: range.position > 0 && slider.enabled
|
||||||
}
|
}
|
||||||
|
|
||||||
RoundShadow {
|
Private.RoundShadow {
|
||||||
id: shadow
|
id: shadow
|
||||||
imagePath: "widgets/slider"
|
imagePath: "widgets/slider"
|
||||||
focusElement: "horizontal-slider-focus"
|
focusElement: "horizontal-slider-focus"
|
||||||
|
|
|
@ -100,7 +100,7 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TabBarLayout {
|
Private.TabBarLayout {
|
||||||
id: tabBarLayout
|
id: tabBarLayout
|
||||||
anchors {
|
anchors {
|
||||||
fill: parent
|
fill: parent
|
||||||
|
|
|
@ -136,7 +136,7 @@ Item {
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
}
|
}
|
||||||
|
|
||||||
IconLoader {
|
Private.IconLoader {
|
||||||
id: imageLoader
|
id: imageLoader
|
||||||
|
|
||||||
implicitWidth: theme.smallIconSize
|
implicitWidth: theme.smallIconSize
|
||||||
|
|
|
@ -178,7 +178,7 @@ Item {
|
||||||
|
|
||||||
opacity: enabled ? 1.0 : 0.5
|
opacity: enabled ? 1.0 : 0.5
|
||||||
|
|
||||||
TextFieldFocus {
|
Private.TextFieldFocus {
|
||||||
id: hover
|
id: hover
|
||||||
state: textArea.activeFocus ? "focus" : (mouseWatcher.containsMouse ? "hover" : "hidden")
|
state: textArea.activeFocus ? "focus" : (mouseWatcher.containsMouse ? "hover" : "hidden")
|
||||||
anchors.fill: base
|
anchors.fill: base
|
||||||
|
|
Loading…
Reference in New Issue
Block a user