replace PlasmaCore functions with Kirigami counterparts

CMakeLists.txt

@@ -18,7 +18,7 @@ include(ECMOptionalAddSubdirectory)
 include(FeatureSummary)
 include(CheckIncludeFiles)
 
-set(KF5_MIN_VERSION "5.24.0")
+set(KF5_MIN_VERSION "6.0.0")
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Plasma
     I18n

package/COPYING

@@ -0,0 +1,346 @@
+NOTE! The GPL below is copyrighted by the Free Software Foundation, but
+the instance of code that it refers to (the kde programs) are copyrighted
+by the authors who actually wrote it.
+
+---------------------------------------------------------------------------
+			
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+               51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, 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 General Public License for more details.
+
+    You should have received a copy of the GNU 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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

package/contents/ui/ApplicationsView.qml

@@ -20,6 +20,7 @@
 */
 import QtQuick 2.0
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.extras as PlasmaExtras
 import org.kde.plasma.components as PlasmaComponents
 
@@ -91,7 +92,7 @@ Item {
         }
         height: childrenRect.height
 
-        Behavior on opacity { NumberAnimation { duration: PlasmaCore.Units.longDuration } }
+        Behavior on opacity { NumberAnimation { duration: Kirigami.Units.longDuration } }
 
         Flickable {
             id: breadcrumbFlickable
@@ -150,8 +151,8 @@ Item {
         anchors {
             top: crumbContainer.bottom
             bottom: parent.bottom
-            rightMargin: -PlasmaCore.Units.largeSpacing
+            rightMargin: -Kirigami.Units.gridUnit
-            leftMargin: -PlasmaCore.Units.largeSpacing
+            leftMargin: -Kirigami.Units.gridUnit
         }
 
         width: parent.width
@@ -159,7 +160,7 @@ Item {
         property Item activatedItem: null
         property var newModel: null
 
-        Behavior on opacity { NumberAnimation { duration: PlasmaCore.Units.longDuration } }
+        Behavior on opacity { NumberAnimation { duration: Kirigami.Units.longDuration } }
 
         focus: true
 
@@ -223,14 +224,14 @@ Item {
                     // and we want the item that has been clicked on, not the one that is under the
                     // mouse once the animation is done
                     ScriptAction { script: applicationsView.activatedItem = applicationsView.currentItem }
-                    NumberAnimation { properties: "x,opacity"; easing.type: Easing.InQuad; duration: PlasmaCore.Units.longDuration }
+                    NumberAnimation { properties: "x,opacity"; easing.type: Easing.InQuad; duration: Kirigami.Units.longDuration }
                     ScriptAction { script: applicationsView.moveRight() }
                 }
             },
             Transition {
                 to: "OutgoingRight"
                 SequentialAnimation {
-                    NumberAnimation { properties: "x,opacity"; easing.type: Easing.InQuad; duration: PlasmaCore.Units.longDuration }
+                    NumberAnimation { properties: "x,opacity"; easing.type: Easing.InQuad; duration: Kirigami.Units.longDuration }
                     ScriptAction { script: applicationsView.moveLeft() }
                 }
             }
@@ -275,7 +276,7 @@ Item {
         visible: opacity != 0
         anchors.centerIn: parent
 
-        Behavior on opacity { NumberAnimation { duration: PlasmaCore.Units.shortDuration } }
+        Behavior on opacity { NumberAnimation { duration: Kirigami.Units.shortDuration } }
     }
 
     Component.onCompleted: {

package/contents/ui/BaseView.qml

@@ -19,6 +19,7 @@
 */
 import QtQuick 2.0
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.extras as PlasmaExtras
 import org.kde.plasma.components as PlasmaComponents
 import org.kde.draganddrop 2.0

package/contents/ui/Breadcrumb.qml

@@ -17,6 +17,7 @@
 */
 import QtQuick 2.0
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.components as PlasmaComponents
 
 Item {

package/contents/ui/ConfigButtons.qml

@@ -20,14 +20,15 @@ import QtQuick 2.5
 import QtQml.Models 2.1
 
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.kirigami 2.5 as Kirigami
 
 
 GridView {
     id: configButtons
 
-    cellHeight: PlasmaCore.Units.gridUnit * 5 + PlasmaCore.Units.smallSpacing
+    cellHeight: Kirigami.Units.gridUnit * 5 + Kirigami.Units.smallSpacing
-    cellWidth: PlasmaCore.Units.gridUnit * 5
+    cellWidth: Kirigami.Units.gridUnit * 5
 
     implicitWidth: cellWidth * 5
     implicitHeight: cellHeight * 2
@@ -125,8 +126,8 @@ GridView {
         delegate: MouseArea {
             id: delegateRoot
 
-            width: PlasmaCore.Units.gridUnit * 5
+            width: Kirigami.Units.gridUnit * 5
-            height: PlasmaCore.Units.gridUnit * 4
+            height: Kirigami.Units.gridUnit * 4
 
             property int visualIndex: DelegateModel.itemsIndex
 

package/contents/ui/ConfigGeneral.qml

@@ -21,6 +21,7 @@ import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.5
 
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.kquickcontrolsaddons as KQuickAddons
 import org.kde.kirigami 2.5 as Kirigami
 
@@ -38,8 +39,8 @@ ColumnLayout {
 
             Kirigami.FormData.label: i18n("Icon:")
 
-            implicitWidth: previewFrame.width + PlasmaCore.Units.smallSpacing * 2
+            implicitWidth: previewFrame.width + Kirigami.Units.smallSpacing * 2
-            implicitHeight: previewFrame.height + PlasmaCore.Units.smallSpacing * 2
+            implicitHeight: previewFrame.height + Kirigami.Units.smallSpacing * 2
 
             KQuickAddons.IconDialog {
                 id: iconDialog
@@ -53,12 +54,12 @@ ColumnLayout {
                 anchors.centerIn: parent
                 imagePath: plasmoid.location === PlasmaCore.Types.Vertical || plasmoid.location === PlasmaCore.Types.Horizontal
                          ? "widgets/panel-background" : "widgets/background"
-                width: PlasmaCore.Units.iconSizes.large + fixedMargins.left + fixedMargins.right
+                width: Kirigami.Units.iconSizes.large + fixedMargins.left + fixedMargins.right
-                height: PlasmaCore.Units.iconSizes.large + fixedMargins.top + fixedMargins.bottom
+                height: Kirigami.Units.iconSizes.large + fixedMargins.top + fixedMargins.bottom
 
-                PlasmaCore.IconItem {
+                Kirigami.Icon {
                     anchors.centerIn: parent
-                    width: PlasmaCore.Units.iconSizes.large
+                    width: Kirigami.Units.iconSizes.large
                     height: width
                     source: cfg_icon
                 }

package/contents/ui/FavoritesView.qml

@@ -24,6 +24,7 @@ import QtQuick 2.0
 import org.kde.kquickcontrolsaddons as KQuickControlsAddons
 
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.extras as PlasmaExtras
 import org.kde.plasma.components as PlasmaComponents
 import org.kde.draganddrop 2.0
@@ -32,7 +33,7 @@ import org.kde.plasma.private.kicker 0.1 as Kicker
 
 Item {
     anchors.fill: parent
-    anchors.topMargin: PlasmaCore.Units.largeSpacing
+    anchors.topMargin: Kirigami.Units.gridUnit
 
     objectName: "FavoritesView"
 

package/contents/ui/FullRepresentation.qml

@@ -23,6 +23,7 @@ import QtQuick 2.3
 import org.kde.plasma.plasmoid 2.0
 import QtQuick.Layouts 1.1
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.components as PlasmaComponents
 import org.kde.plasma.extras as PlasmaExtras
 import org.kde.kquickcontrolsaddons 2.0
@@ -31,10 +32,10 @@ import org.kde.plasma.private.kicker 0.1 as Kicker
 
 Item {
     id: root
-    Layout.minimumWidth: PlasmaCore.Units.gridUnit * 26
+    Layout.minimumWidth: Kirigami.Units.gridUnit * 26
     Layout.maximumWidth: Layout.minimumWidth
 
-    Layout.minimumHeight: PlasmaCore.Units.gridUnit * 34
+    Layout.minimumHeight: Kirigami.Units.gridUnit * 34
     Layout.maximumHeight: Layout.minimumHeight
 
     property string previousState
@@ -63,7 +64,7 @@ Item {
     Kicker.DragHelper {
         id: dragHelper
 
-        dragIconSize: PlasmaCore.Units.iconSizes.medium
+        dragIconSize: Kirigami.Units.iconSizes.medium
         onDropped: kickoff.dragSource = null
     }
 
@@ -120,7 +121,7 @@ Item {
 
     Item {
         id: mainArea
-        anchors.topMargin: mainTabGroup.state == "top" ? PlasmaCore.Units.smallSpacing : 0
+        anchors.topMargin: mainTabGroup.state == "top" ? Kirigami.Units.smallSpacing : 0
 
         PlasmaComponents.TabGroup {
             id: mainTabGroup
@@ -207,7 +208,7 @@ Item {
                     }
                     PropertyChanges {
                         target: tabBar
-                        width: (tabBar.opacity == 0) ? 0 : PlasmaCore.Units.gridUnit * 5
+                        width: (tabBar.opacity == 0) ? 0 : Kirigami.Units.gridUnit * 5
                     }
                     AnchorChanges {
                         target: tabBar
@@ -259,7 +260,7 @@ Item {
                     }
                     PropertyChanges {
                         target: tabBar
-                        height: (tabBar.opacity == 0) ? 0 : PlasmaCore.Units.gridUnit * 5
+                        height: (tabBar.opacity == 0) ? 0 : Kirigami.Units.gridUnit * 5
                     }
                     AnchorChanges {
                         target: tabBar
@@ -311,7 +312,7 @@ Item {
                     }
                     PropertyChanges {
                         target: tabBar
-                        width: (tabBar.opacity == 0) ? 0 : PlasmaCore.Units.gridUnit * 5
+                        width: (tabBar.opacity == 0) ? 0 : Kirigami.Units.gridUnit * 5
                     }
                     AnchorChanges {
                         target: tabBar
@@ -363,7 +364,7 @@ Item {
                     }
                     PropertyChanges {
                         target: tabBar
-                        height: (tabBar.opacity == 0) ? 0 : PlasmaCore.Units.gridUnit * 5
+                        height: (tabBar.opacity == 0) ? 0 : Kirigami.Units.gridUnit * 5
                     }
                     AnchorChanges {
                         target: tabBar
@@ -398,11 +399,11 @@ Item {
         property int count: 5 // updated in createButtons()
 
         Behavior on width {
-            NumberAnimation { duration: PlasmaCore.Units.longDuration; easing.type: Easing.InQuad; }
+            NumberAnimation { duration: Kirigami.Units.longDuration; easing.type: Easing.InQuad; }
             enabled: plasmoid.expanded
         }
         Behavior on height {
-            NumberAnimation { duration: PlasmaCore.Units.longDuration; easing.type: Easing.InQuad; }
+            NumberAnimation { duration: Kirigami.Units.longDuration; easing.type: Easing.InQuad; }
             enabled: plasmoid.expanded
         }
 

package/contents/ui/Header.qml

@@ -20,6 +20,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.components 3.0 as PlasmaComponents
 import org.kde.plasma.extras as PlasmaExtras
 import org.kde.kcoreaddons 1.0 as KCoreAddons
@@ -33,7 +34,7 @@ import QtGraphicalEffects 1.0
 PlasmaExtras.PlasmoidHeading {
     id: header
 
-    implicitHeight: PlasmaCore.Units.gridUnit * 5
+    implicitHeight: Kirigami.Units.gridUnit * 5
 
     property alias query: queryField.text
     property Item input: queryField
@@ -77,15 +78,15 @@ PlasmaExtras.PlasmoidHeading {
 
             flat: true
 
-            Layout.preferredWidth: PlasmaCore.Units.gridUnit * 3
+            Layout.preferredWidth: Kirigami.Units.gridUnit * 3
-            Layout.preferredHeight: PlasmaCore.Units.gridUnit * 3
+            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
 
             Kirigami.Avatar {
                 source: kuser.faceIconUrl
                 name: nameLabel
                 anchors {
                     fill: parent
-                    margins: PlasmaCore.Units.smallSpacing
+                    margins: Kirigami.Units.smallSpacing
                 }
             }
 
@@ -96,13 +97,13 @@ PlasmaExtras.PlasmoidHeading {
 
         ColumnLayout {
             Layout.fillWidth: true
-            Layout.rightMargin: PlasmaCore.Units.gridUnit
+            Layout.rightMargin: Kirigami.Units.gridUnit
 
             Item {
                 Layout.fillWidth: true
-                Layout.preferredHeight: PlasmaCore.Units.gridUnit
+                Layout.preferredHeight: Kirigami.Units.gridUnit
 
-                PlasmaExtras.Heading {
+                Kirigami.Heading {
                     id: nameLabel
                     anchors.fill: parent
 
@@ -112,7 +113,7 @@ PlasmaExtras.PlasmoidHeading {
                     horizontalAlignment: Text.AlignLeft
                     verticalAlignment: Text.AlignBottom
 
-                    Behavior on opacity { NumberAnimation { duration:  PlasmaCore.Units.longDuration; easing.type: Easing.InOutQuad; } }
+                    Behavior on opacity { NumberAnimation { duration:  Kirigami.Units.longDuration; easing.type: Easing.InOutQuad; } }
 
                     // Show the info instead of the user's name when hovering over it
                     MouseArea {
@@ -127,7 +128,7 @@ PlasmaExtras.PlasmoidHeading {
                     }
                 }
 
-                PlasmaExtras.Heading {
+                Kirigami.Heading {
                     id: infoLabel
                     anchors.fill: parent
                     level: 5
@@ -137,7 +138,7 @@ PlasmaExtras.PlasmoidHeading {
                     horizontalAlignment: Text.AlignLeft
                     verticalAlignment: Text.AlignBottom
 
-                    Behavior on opacity { NumberAnimation { duration:  PlasmaCore.Units.longDuration; easing.type: Easing.InOutQuad; } }
+                    Behavior on opacity { NumberAnimation { duration:  Kirigami.Units.longDuration; easing.type: Easing.InOutQuad; } }
                 }
             }
 

package/contents/ui/KickoffButton.qml

@@ -17,6 +17,7 @@
 */
 import QtQuick 2.0
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.components as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 
@@ -31,7 +32,7 @@ PlasmaComponents.TabButton {
 
     Item {
         anchors {
-            margins: PlasmaCore.Units.smallSpacing
+            margins: Kirigami.Units.smallSpacing
             left: parent.left
             right: parent.right
             verticalCenter: parent.verticalCenter
@@ -39,11 +40,11 @@ PlasmaComponents.TabButton {
 
         height: childrenRect.height
 
-        PlasmaCore.IconItem {
+        Kirigami.Icon {
             id: iconElement
 
             anchors.horizontalCenter: parent.horizontalCenter
-            width: PlasmaCore.Units.iconSizes.medium
+            width: Kirigami.Units.iconSizes.medium
             height: width
 
             source: iconSource

package/contents/ui/KickoffConfigurationButton.qml

@@ -18,6 +18,7 @@
 
 import QtQuick 2.0
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import QtQuick.Controls 1.0 as QtControls
 import QtQuick.Layouts 1.1
 import org.kde.kquickcontrolsaddons 2.0
@@ -28,8 +29,8 @@ PlasmaCore.FrameSvgItem {
     property alias text: textElement.text
     property string name
 
-    width: PlasmaCore.Units.gridUnit * 5
+    width: Kirigami.Units.gridUnit * 5
-    height: PlasmaCore.Units.gridUnit * 4
+    height: Kirigami.Units.gridUnit * 4
 
     visible: name != "empty"
 
@@ -38,11 +39,11 @@ PlasmaCore.FrameSvgItem {
     ColumnLayout {
         anchors.centerIn: parent
 
-        PlasmaCore.IconItem {
+        Kirigami.Icon {
             id: iconElement
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: PlasmaCore.Units.iconSizes.medium
+            Layout.preferredWidth: Kirigami.Units.iconSizes.medium
             Layout.preferredHeight: width
 
             source: icon

package/contents/ui/KickoffHighlight.qml

@@ -18,14 +18,15 @@
 
 import QtQuick 2.0
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.components as PlasmaComponents
 
 Item {
     PlasmaComponents.Highlight {
         anchors {
             fill: parent
-            leftMargin: PlasmaCore.Units.smallSpacing * 4
+            leftMargin: Kirigami.Units.smallSpacing * 4
-            rightMargin: PlasmaCore.Units.smallSpacing * 4
+            rightMargin: Kirigami.Units.smallSpacing * 4
         }
     }
 }

package/contents/ui/KickoffItem.qml

@@ -20,6 +20,7 @@
 */
 import QtQuick 2.0
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.components as PlasmaComponents
 import org.kde.draganddrop 2.0
 
@@ -31,7 +32,7 @@ Item {
     enabled: !model.disabled
 
     width: ListView.view.width
-    height: (PlasmaCore.Units.smallSpacing * 2) + Math.max(elementIcon.height, titleElement.implicitHeight + subTitleElement.implicitHeight)
+    height: (Kirigami.Units.smallSpacing * 2) + Math.max(elementIcon.height, titleElement.implicitHeight + subTitleElement.implicitHeight)
 
     signal reset
     signal actionTriggered(string actionId, variant actionArgument)
@@ -97,15 +98,15 @@ Item {
         }
     }
 
-    PlasmaCore.IconItem {
+    Kirigami.Icon {
         id: elementIcon
 
         anchors {
             left: parent.left
-            leftMargin: PlasmaCore.Units.smallSpacing * 6
+            leftMargin: Kirigami.Units.smallSpacing * 6
             verticalCenter: parent.verticalCenter
         }
-        width: PlasmaCore.Units.iconSizes.medium
+        width: Kirigami.Units.iconSizes.medium
         height: width
 
         animated: false
@@ -122,8 +123,8 @@ Item {
             //bottom: elementIcon.verticalCenter
             left: elementIcon.right
             right: arrow.left
-            leftMargin: PlasmaCore.Units.smallSpacing * 4
+            leftMargin: Kirigami.Units.smallSpacing * 4
-            rightMargin: PlasmaCore.Units.smallSpacing * 6
+            rightMargin: Kirigami.Units.smallSpacing * 6
         }
         height: implicitHeight //undo PC2 height override, remove when porting to PC3
         // TODO: games should always show the by name!
@@ -154,11 +155,11 @@ Item {
 
         anchors {
             right: parent.right
-            rightMargin: PlasmaCore.Units.smallSpacing * 6
+            rightMargin: Kirigami.Units.smallSpacing * 6
             verticalCenter: parent.verticalCenter
         }
 
-        width: visible ? PlasmaCore.Units.iconSizes.small : 0
+        width: visible ? Kirigami.Units.iconSizes.small : 0
         height: width
 
         visible: (model.hasChildren === true)

package/contents/ui/KickoffListView.qml

@@ -19,6 +19,7 @@
 */
 import QtQuick 2.0
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.extras as PlasmaExtras
 import org.kde.plasma.components as PlasmaComponents
 
@@ -175,10 +176,10 @@ FocusScope {
                         if (pressed && pressX != -1 && pressed.url && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) {
                             kickoff.dragSource = item;
                             if (mouse.source == Qt.MouseEventSynthesizedByQt) {
-                                dragHelper.dragIconSize = PlasmaCore.Units.iconSizes.huge
+                                dragHelper.dragIconSize = Kirigami.Units.iconSizes.huge
                                 dragHelper.startDrag(kickoff, pressed.url, pressed.decoration);
                             } else {
-                                dragHelper.dragIconSize = PlasmaCore.Units.iconSizes.medium
+                                dragHelper.dragIconSize = Kirigami.Units.iconSizes.medium
                                 dragHelper.startDrag(kickoff, pressed.url, pressed.decoration);
                             }
                             pressed = null;

package/contents/ui/SearchView.qml

@@ -19,6 +19,7 @@
 */
 import QtQuick 2.0
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.extras as PlasmaExtras
 import org.kde.plasma.components as PlasmaComponents
 

package/contents/ui/SectionDelegate.qml

@@ -18,6 +18,7 @@
 */
 import QtQuick 2.0
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.components as PlasmaComponents
 import org.kde.plasma.extras as PlasmaExtras
 
@@ -28,21 +29,21 @@ Item {
     width: parent.width
     height: childrenRect.height
 
-    PlasmaExtras.Heading {
+    Kirigami.Heading {
         id: sectionHeading
         anchors {
             left: parent.left
             right: parent.right
-            leftMargin: PlasmaCore.Units.gridUnit
+            leftMargin: Kirigami.Units.gridUnit
         }
 
-        y: Math.round(PlasmaCore.Units.gridUnit / 4)
+        y: Math.round(Kirigami.Units.gridUnit / 4)
         level: 4
         text: section
     }
     Item {
         width: parent.width
-        height: Math.round(PlasmaCore.Units.gridUnit / 4)
+        height: Math.round(Kirigami.Units.gridUnit / 4)
         anchors.left: parent.left
         anchors.top: sectionHeading.bottom
     }

package/contents/ui/main.qml

@@ -24,6 +24,7 @@ import QtQuick.Layouts 1.1
 
 import org.kde.plasma.plasmoid
 import org.kde.plasma.core as PlasmaCore
+import org.kde.kirigami as Kirigami
 import org.kde.plasma.components as PlasmaComponents
 import org.kde.plasma.extras as PlasmaExtras
 import org.kde.kquickcontrolsaddons
@@ -39,8 +40,8 @@ PlasmoidItem {
         || plasmoid.location === PlasmaCore.Types.LeftEdge)
     readonly property bool vertical: (plasmoid.formFactor === PlasmaCore.Types.Vertical)
 
-    Plasmoid.switchWidth: PlasmaCore.Units.gridUnit * 20
+    Plasmoid.switchWidth: Kirigami.Units.gridUnit * 20
-    Plasmoid.switchHeight: PlasmaCore.Units.gridUnit * 30
+    Plasmoid.switchHeight: Kirigami.Units.gridUnit * 30
 
     Plasmoid.fullRepresentation: FullRepresentation {}
 
@@ -51,23 +52,23 @@ PlasmoidItem {
 
         Layout.minimumWidth: {
             if (!inPanel) {
-                return PlasmaCore.Units.iconSizeHints.panel;
+                return Kirigami.Units.iconSizeHints.panel;
             }
 
             if (vertical) {
                 return -1;
             } else {
-                return Math.min(PlasmaCore.Units.iconSizeHints.panel, parent.height) * buttonIcon.aspectRatio;
+                return Math.min(Kirigami.Units.iconSizeHints.panel, parent.height) * buttonIcon.aspectRatio;
             }
         }
 
         Layout.minimumHeight: {
             if (!inPanel) {
-                return PlasmaCore.Units.iconSizeHints.panel;
+                return Kirigami.Units.iconSizeHints.panel;
             }
 
             if (vertical) {
-                return Math.min(PlasmaCore.Units.iconSizeHints.panel, parent.width) * buttonIcon.aspectRatio;
+                return Math.min(Kirigami.Units.iconSizeHints.panel, parent.width) * buttonIcon.aspectRatio;
             } else {
                 return -1;
             }
@@ -79,9 +80,9 @@ PlasmoidItem {
             }
 
             if (vertical) {
-                return PlasmaCore.Units.iconSizeHints.panel;
+                return Kirigami.Units.iconSizeHints.panel;
             } else {
-                return Math.min(PlasmaCore.Units.iconSizeHints.panel, parent.height) * buttonIcon.aspectRatio;
+                return Math.min(Kirigami.Units.iconSizeHints.panel, parent.height) * buttonIcon.aspectRatio;
             }
         }
 
@@ -91,9 +92,9 @@ PlasmoidItem {
             }
 
             if (vertical) {
-                return Math.min(PlasmaCore.Units.iconSizeHints.panel, parent.width) * buttonIcon.aspectRatio;
+                return Math.min(Kirigami.Units.iconSizeHints.panel, parent.width) * buttonIcon.aspectRatio;
             } else {
-                return PlasmaCore.Units.iconSizeHints.panel;
+                return Kirigami.Units.iconSizeHints.panel;
             }
         }
 
@@ -113,7 +114,7 @@ PlasmoidItem {
             onTriggered: plasmoid.expanded = true
         }
 
-        PlasmaCore.IconItem {
+        Kirigami.Icon {
             id: buttonIcon
 
             readonly property double aspectRatio: (vertical ? implicitHeight / implicitWidth