diff --git a/src/declarativeimports/CMakeLists.txt b/src/declarativeimports/CMakeLists.txt --- a/src/declarativeimports/CMakeLists.txt +++ b/src/declarativeimports/CMakeLists.txt @@ -6,4 +6,49 @@ add_subdirectory(calendar) install(DIRECTORY plasmastyle/ DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls/Styles/Plasma) -install(DIRECTORY qqc2style/ DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2/Plasma) + + +#install the componenbts as a QQC2 Style, as style for applications (mainly for Plasma Mobile) +install(DIRECTORY plasmacomponents3/ DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2/Plasma PATTERN qmldir EXCLUDE) + +#install some of the componets as a separate import, to be used in plasmoids (some of them like ApplicationWindow are of no use for plasmoids) +install(FILES plasmacomponents3/BusyIndicator.qml + plasmacomponents3/Button.qml + plasmacomponents3/CheckBox.qml + plasmacomponents3/CheckDelegate.qml + plasmacomponents3/CheckIndicator.qml + #combobox is not in a new window, but maybe better already than the broken qqc1 combobox? + plasmacomponents3/ComboBox.qml + plasmacomponents3/Container.qml + plasmacomponents3/Control.qml + plasmacomponents3/Dial.qml + plasmacomponents3/Frame.qml + plasmacomponents3/GroupBox.qml + plasmacomponents3/ItemDelegate.qml + plasmacomponents3/Label.qml + #menu and menuitem probably not useful as are not qmenus + plasmacomponents3/MenuItem.qml + plasmacomponents3/Menu.qml + + plasmacomponents3/ProgressBar.qml + plasmacomponents3/RadioButton.qml + plasmacomponents3/RadioDelegate.qml + plasmacomponents3/RadioIndicator.qml + plasmacomponents3/RangeSlider.qml + plasmacomponents3/ScrollBar.qml + plasmacomponents3/Slider.qml + plasmacomponents3/SpinBox.qml + + #maybe we really don't want the switch control in Plasma Desktop + plasmacomponents3/SwitchDelegate.qml + plasmacomponents3/SwitchIndicator.qml + plasmacomponents3/Switch.qml + + plasmacomponents3/TabBar.qml + plasmacomponents3/TabButton.qml + plasmacomponents3/TextArea.qml + plasmacomponents3/TextField.qml + plasmacomponents3/ToolBar.qml + plasmacomponents3/ToolButton.qml + + DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components.3) diff --git a/src/declarativeimports/qqc2style/BusyIndicator.qml b/src/declarativeimports/plasmacomponents3/BusyIndicator.qml rename from src/declarativeimports/qqc2style/BusyIndicator.qml rename to src/declarativeimports/plasmacomponents3/BusyIndicator.qml diff --git a/src/declarativeimports/qqc2style/Button.qml b/src/declarativeimports/plasmacomponents3/Button.qml rename from src/declarativeimports/qqc2style/Button.qml rename to src/declarativeimports/plasmacomponents3/Button.qml diff --git a/src/declarativeimports/qqc2style/CheckBox.qml b/src/declarativeimports/plasmacomponents3/CheckBox.qml rename from src/declarativeimports/qqc2style/CheckBox.qml rename to src/declarativeimports/plasmacomponents3/CheckBox.qml diff --git a/src/declarativeimports/qqc2style/CheckDelegate.qml b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml rename from src/declarativeimports/qqc2style/CheckDelegate.qml rename to src/declarativeimports/plasmacomponents3/CheckDelegate.qml diff --git a/src/declarativeimports/qqc2style/CheckIndicator.qml b/src/declarativeimports/plasmacomponents3/CheckIndicator.qml rename from src/declarativeimports/qqc2style/CheckIndicator.qml rename to src/declarativeimports/plasmacomponents3/CheckIndicator.qml diff --git a/src/declarativeimports/qqc2style/ComboBox.qml b/src/declarativeimports/plasmacomponents3/ComboBox.qml rename from src/declarativeimports/qqc2style/ComboBox.qml rename to src/declarativeimports/plasmacomponents3/ComboBox.qml diff --git a/src/declarativeimports/qqc2style/Container.qml b/src/declarativeimports/plasmacomponents3/Container.qml rename from src/declarativeimports/qqc2style/Container.qml rename to src/declarativeimports/plasmacomponents3/Container.qml diff --git a/src/declarativeimports/qqc2style/Control.qml b/src/declarativeimports/plasmacomponents3/Control.qml rename from src/declarativeimports/qqc2style/Control.qml rename to src/declarativeimports/plasmacomponents3/Control.qml diff --git a/src/declarativeimports/qqc2style/Dial.qml b/src/declarativeimports/plasmacomponents3/Dial.qml rename from src/declarativeimports/qqc2style/Dial.qml rename to src/declarativeimports/plasmacomponents3/Dial.qml diff --git a/src/declarativeimports/qqc2style/Dialog.qml b/src/declarativeimports/plasmacomponents3/Dialog.qml rename from src/declarativeimports/qqc2style/Dialog.qml rename to src/declarativeimports/plasmacomponents3/Dialog.qml diff --git a/src/declarativeimports/qqc2style/DialogButtonBox.qml b/src/declarativeimports/plasmacomponents3/DialogButtonBox.qml rename from src/declarativeimports/qqc2style/DialogButtonBox.qml rename to src/declarativeimports/plasmacomponents3/DialogButtonBox.qml diff --git a/src/declarativeimports/qqc2style/Drawer.qml b/src/declarativeimports/plasmacomponents3/Drawer.qml rename from src/declarativeimports/qqc2style/Drawer.qml rename to src/declarativeimports/plasmacomponents3/Drawer.qml diff --git a/src/declarativeimports/qqc2style/Frame.qml b/src/declarativeimports/plasmacomponents3/Frame.qml rename from src/declarativeimports/qqc2style/Frame.qml rename to src/declarativeimports/plasmacomponents3/Frame.qml diff --git a/src/declarativeimports/qqc2style/GroupBox.qml b/src/declarativeimports/plasmacomponents3/GroupBox.qml rename from src/declarativeimports/qqc2style/GroupBox.qml rename to src/declarativeimports/plasmacomponents3/GroupBox.qml diff --git a/src/declarativeimports/qqc2style/ItemDelegate.qml b/src/declarativeimports/plasmacomponents3/ItemDelegate.qml rename from src/declarativeimports/qqc2style/ItemDelegate.qml rename to src/declarativeimports/plasmacomponents3/ItemDelegate.qml diff --git a/src/declarativeimports/qqc2style/Label.qml b/src/declarativeimports/plasmacomponents3/Label.qml rename from src/declarativeimports/qqc2style/Label.qml rename to src/declarativeimports/plasmacomponents3/Label.qml diff --git a/src/declarativeimports/qqc2style/Menu.qml b/src/declarativeimports/plasmacomponents3/Menu.qml rename from src/declarativeimports/qqc2style/Menu.qml rename to src/declarativeimports/plasmacomponents3/Menu.qml diff --git a/src/declarativeimports/qqc2style/MenuItem.qml b/src/declarativeimports/plasmacomponents3/MenuItem.qml rename from src/declarativeimports/qqc2style/MenuItem.qml rename to src/declarativeimports/plasmacomponents3/MenuItem.qml diff --git a/src/declarativeimports/qqc2style/Popup.qml b/src/declarativeimports/plasmacomponents3/Popup.qml rename from src/declarativeimports/qqc2style/Popup.qml rename to src/declarativeimports/plasmacomponents3/Popup.qml diff --git a/src/declarativeimports/qqc2style/ProgressBar.qml b/src/declarativeimports/plasmacomponents3/ProgressBar.qml rename from src/declarativeimports/qqc2style/ProgressBar.qml rename to src/declarativeimports/plasmacomponents3/ProgressBar.qml diff --git a/src/declarativeimports/qqc2style/RadioButton.qml b/src/declarativeimports/plasmacomponents3/RadioButton.qml rename from src/declarativeimports/qqc2style/RadioButton.qml rename to src/declarativeimports/plasmacomponents3/RadioButton.qml diff --git a/src/declarativeimports/qqc2style/RadioDelegate.qml b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml rename from src/declarativeimports/qqc2style/RadioDelegate.qml rename to src/declarativeimports/plasmacomponents3/RadioDelegate.qml diff --git a/src/declarativeimports/qqc2style/RadioIndicator.qml b/src/declarativeimports/plasmacomponents3/RadioIndicator.qml rename from src/declarativeimports/qqc2style/RadioIndicator.qml rename to src/declarativeimports/plasmacomponents3/RadioIndicator.qml diff --git a/src/declarativeimports/qqc2style/RangeSlider.qml b/src/declarativeimports/plasmacomponents3/RangeSlider.qml rename from src/declarativeimports/qqc2style/RangeSlider.qml rename to src/declarativeimports/plasmacomponents3/RangeSlider.qml diff --git a/src/declarativeimports/qqc2style/ScrollBar.qml b/src/declarativeimports/plasmacomponents3/ScrollBar.qml rename from src/declarativeimports/qqc2style/ScrollBar.qml rename to src/declarativeimports/plasmacomponents3/ScrollBar.qml diff --git a/src/declarativeimports/qqc2style/Slider.qml b/src/declarativeimports/plasmacomponents3/Slider.qml rename from src/declarativeimports/qqc2style/Slider.qml rename to src/declarativeimports/plasmacomponents3/Slider.qml diff --git a/src/declarativeimports/qqc2style/SpinBox.qml b/src/declarativeimports/plasmacomponents3/SpinBox.qml rename from src/declarativeimports/qqc2style/SpinBox.qml rename to src/declarativeimports/plasmacomponents3/SpinBox.qml diff --git a/src/declarativeimports/qqc2style/Switch.qml b/src/declarativeimports/plasmacomponents3/Switch.qml rename from src/declarativeimports/qqc2style/Switch.qml rename to src/declarativeimports/plasmacomponents3/Switch.qml diff --git a/src/declarativeimports/qqc2style/SwitchDelegate.qml b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml rename from src/declarativeimports/qqc2style/SwitchDelegate.qml rename to src/declarativeimports/plasmacomponents3/SwitchDelegate.qml diff --git a/src/declarativeimports/qqc2style/SwitchIndicator.qml b/src/declarativeimports/plasmacomponents3/SwitchIndicator.qml rename from src/declarativeimports/qqc2style/SwitchIndicator.qml rename to src/declarativeimports/plasmacomponents3/SwitchIndicator.qml diff --git a/src/declarativeimports/qqc2style/TabBar.qml b/src/declarativeimports/plasmacomponents3/TabBar.qml rename from src/declarativeimports/qqc2style/TabBar.qml rename to src/declarativeimports/plasmacomponents3/TabBar.qml diff --git a/src/declarativeimports/qqc2style/TabButton.qml b/src/declarativeimports/plasmacomponents3/TabButton.qml rename from src/declarativeimports/qqc2style/TabButton.qml rename to src/declarativeimports/plasmacomponents3/TabButton.qml diff --git a/src/declarativeimports/qqc2style/TextArea.qml b/src/declarativeimports/plasmacomponents3/TextArea.qml rename from src/declarativeimports/qqc2style/TextArea.qml rename to src/declarativeimports/plasmacomponents3/TextArea.qml diff --git a/src/declarativeimports/qqc2style/TextField.qml b/src/declarativeimports/plasmacomponents3/TextField.qml rename from src/declarativeimports/qqc2style/TextField.qml rename to src/declarativeimports/plasmacomponents3/TextField.qml diff --git a/src/declarativeimports/qqc2style/ToolBar.qml b/src/declarativeimports/plasmacomponents3/ToolBar.qml rename from src/declarativeimports/qqc2style/ToolBar.qml rename to src/declarativeimports/plasmacomponents3/ToolBar.qml diff --git a/src/declarativeimports/qqc2style/ToolButton.qml b/src/declarativeimports/plasmacomponents3/ToolButton.qml rename from src/declarativeimports/qqc2style/ToolButton.qml rename to src/declarativeimports/plasmacomponents3/ToolButton.qml diff --git a/src/declarativeimports/qqc2style/ToolTip.qml b/src/declarativeimports/plasmacomponents3/ToolTip.qml rename from src/declarativeimports/qqc2style/ToolTip.qml rename to src/declarativeimports/plasmacomponents3/ToolTip.qml diff --git a/src/declarativeimports/qqc2style/private/ButtonShadow.qml b/src/declarativeimports/plasmacomponents3/private/ButtonShadow.qml rename from src/declarativeimports/qqc2style/private/ButtonShadow.qml rename to src/declarativeimports/plasmacomponents3/private/ButtonShadow.qml diff --git a/src/declarativeimports/qqc2style/private/DefaultListItemBackground.qml b/src/declarativeimports/plasmacomponents3/private/DefaultListItemBackground.qml rename from src/declarativeimports/qqc2style/private/DefaultListItemBackground.qml rename to src/declarativeimports/plasmacomponents3/private/DefaultListItemBackground.qml diff --git a/src/declarativeimports/qqc2style/private/RoundShadow.qml b/src/declarativeimports/plasmacomponents3/private/RoundShadow.qml rename from src/declarativeimports/qqc2style/private/RoundShadow.qml rename to src/declarativeimports/plasmacomponents3/private/RoundShadow.qml diff --git a/src/declarativeimports/qqc2style/private/TextFieldFocus.qml b/src/declarativeimports/plasmacomponents3/private/TextFieldFocus.qml rename from src/declarativeimports/qqc2style/private/TextFieldFocus.qml rename to src/declarativeimports/plasmacomponents3/private/TextFieldFocus.qml diff --git a/src/declarativeimports/plasmacomponents3/qmldir b/src/declarativeimports/plasmacomponents3/qmldir new file mode 100644 --- /dev/null +++ b/src/declarativeimports/plasmacomponents3/qmldir @@ -0,0 +1,39 @@ +module org.kde.plasma.components + +BusyIndicator 3.0 BusyIndicator.qml +Button 3.0 Button.qml +CheckBox 3.0 CheckBox.qml +CheckDelegate 3.0 CheckDelegate.qml +CheckIndicator 3.0 CheckIndicator.qml +ComboBox 3.0 ComboBox.qml +Container 3.0 Container.qml +Control 3.0 Control.qml +DialogButtonBox 3.0 DialogButtonBox.qml +Dialog 3.0 Dialog.qml +Dial 3.0 Dial.qml +Drawer 3.0 Drawer.qml +Frame 3.0 Frame.qml +GroupBox 3.0 GroupBox.qml +ItemDelegate 3.0 ItemDelegate.qml +Label 3.0 Label.qml +MenuItem 3.0 MenuItem.qml +Menu 3.0 Menu.qml +Popup 3.0 Popup.qml +ProgressBar 3.0 ProgressBar.qml +RadioButton 3.0 RadioButton.qml +RadioDelegate 3.0 RadioDelegate.qml +RadioIndicator 3.0 RadioIndicator.qml +RangeSlider 3.0 RangeSlider.qml +ScrollBar 3.0 ScrollBar.qml +Slider 3.0 Slider.qml +SpinBox 3.0 SpinBox.qml +SwitchDelegate 3.0 SwitchDelegate.qml +SwitchIndicator 3.0 SwitchIndicator.qml +Switch 3.0 Switch.qml +TabBar 3.0 TabBar.qml +TabButton 3.0 TabButton.qml +TextArea 3.0 TextArea.qml +TextField 3.0 TextField.qml +ToolBar 3.0 ToolBar.qml +ToolButton 3.0 ToolButton.qml +ToolTip 3.0 ToolTip.qml