[Sizing] Remove sizeing move to Theme class

examples/sizeview/glacier-sizeview.qml

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2024 Chupligin Sergey <[email protected]>
+ * Copyright (C) 2017-2025 Chupligin Sergey <[email protected]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -19,6 +19,7 @@
 
 import QtQuick
 import QtQuick.Window
+import Nemo
 import Nemo.Controls
 
 ApplicationWindow {
@@ -88,18 +89,18 @@ ApplicationWindow {
                 }
 
                 Label{
-                    text: "DP Scale factor: " + size.dpScaleFactor;
+                    text: "DP Scale factor: " + Theme.dpScaleFactor;
                 }
 
 
                 Label{
-                    text: "MM Scale factor: " + size.mmScaleFactor;
+                    text: "MM Scale factor: " + Theme.mmScaleFactor;
                 }
 
                 Rectangle{
                     color: Theme.accentColor
-                    width: size.mm(10)
-                    height: size.mm(10)
+                    width: Theme.mm(10)
+                    height: Theme.mm(10)
 
                     Label{
                         anchors.centerIn: parent

src/controls/qml/DatePicker.qml

@@ -1,6 +1,6 @@
 /****************************************************************************************
 **
-** Copyright (C) 2017-2021 Chupligin Sergey <[email protected]>
+** Copyright (C) 2017-2025 Chupligin Sergey <[email protected]>
 ** All rights reserved.
 **
 ** You may use this file under the terms of BSD license as follows:
@@ -31,6 +31,7 @@
 
 import QtQuick
 
+import Nemo
 import Nemo.Controls
 import Nemo.Models
 

src/controls/qml/GlacierRoller.qml

@@ -1,4 +1,24 @@
+/*
+ * Copyright (C) 2018-2025 Chupligin Sergey <[email protected]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
 import QtQuick 2.6
+import Nemo
 
 Item {
     id: glacierRoller
@@ -33,7 +53,7 @@ Item {
     Rectangle{
         id: topLine
         width: parent.width
-        height: size.dp(1)
+        height: Theme.dp(1)
         color: Theme.backgroundAccentColor
         anchors.top: view.top
         z: 2
@@ -42,7 +62,7 @@ Item {
     Rectangle{
         id: bottomLine
         width: parent.width
-        height: size.dp(3)
+        height: Theme.dp(3)
         color: Theme.backgroundAccentColor
         anchors.bottom: view.bottom
         z: 2

src/controls/qml/GlacierRollerItem.qml

@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2018-2023 Chupligin Sergey <[email protected]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
 import QtQuick 2.6
 
 Rectangle{

src/controls/qml/ListView.qml

@@ -1,6 +1,6 @@
 /****************************************************************************************
 **
-** Copyright (C) 2023 Chupligin Sergey <[email protected]>
+** Copyright (C) 2023-2025 Chupligin Sergey <[email protected]>
 ** All rights reserved.
 **
 ** You may use this file under the terms of BSD license as follows:
@@ -32,6 +32,8 @@
 import QtQuick 2.6
 import QtQuick.Controls
 
+import Nemo
+
 ListView {
     id: listView
 
@@ -68,7 +70,7 @@ ListView {
 
             Rectangle{
                 id: line
-                height: size.dp(1)
+                height: Theme.dp(1)
                 color: Theme.textColor
                 width: listView.width-sectionText.width-Theme.itemHeightExtraSmall
                 anchors{

src/controls/qml/ListViewItemWithActions.qml

@@ -1,6 +1,6 @@
 /****************************************************************************************
 **
-** Copyright (C) 2017-2023 Chupligin Sergey <[email protected]>
+** Copyright (C) 2017-2025 Chupligin Sergey <[email protected]>
 ** All rights reserved.
 **
 ** You may use this file under the terms of BSD license as follows:
@@ -32,6 +32,7 @@
 import QtQuick
 import QtQuick.Shapes
 
+import Nemo
 import Nemo.Controls
 
 Item {

src/controls/qml/ScrollDecorator.qml

@@ -1,6 +1,6 @@
 /****************************************************************************************
 **
-** Copyright (C) 2017 Chupligin Sergey <[email protected]>
+** Copyright (C) 2017-2025 Chupligin Sergey <[email protected]>
 ** All rights reserved.
 **
 ** You may use this file under the terms of BSD license as follows:
@@ -32,6 +32,7 @@
 import QtQuick 2.6
 import QtQuick.Controls
 
+import Nemo
 import Nemo.Controls
 
 Rectangle{

src/controls/qml/TabButton.qml

@@ -48,7 +48,7 @@ TabButton {
                 bottom: parent.bottom
             }
             width: parent.width
-            height: size.dp(1)
+            height: Theme.dp(1)
             color: Theme.accentColor
         }
     }

src/controls/qml/TextField.qml

@@ -1,7 +1,7 @@
 /****************************************************************************************
 **
 ** Copyright (c) 2017, Eetu Kahelin
-** Copyright (C) 2021-2023 Chupligin Sergey <[email protected]>
+** Copyright (C) 2021-2025 Chupligin Sergey <[email protected]>
 ** All rights reserved.
 **
 ** You may use this file under the terms of BSD license as follows:
@@ -77,7 +77,7 @@ TextField {
             anchors.bottom: parent.bottom
             anchors.left: parent.left
             anchors.right: parent.right
-            height: size.dp(2)
+            height: Theme.dp(2)
             width: parent.width
             color: control.readOnly ? Theme.fillDarkColor : Theme.accentColor
         }

src/controls/qml/TimePicker.qml

@@ -1,6 +1,6 @@
 /****************************************************************************************
 **
-** Copyright (C) 2018-2021 Chupligin Sergey <[email protected]>
+** Copyright (C) 2018-2025 Chupligin Sergey <[email protected]>
 ** All rights reserved.
 **
 ** You may use this file under the terms of BSD license as follows:
@@ -30,6 +30,8 @@
 ****************************************************************************************/
 
 import QtQuick 2.6
+
+import Nemo
 import Nemo.Controls
 
 Item{

src/controls/qml/ToolButton.qml

@@ -1,6 +1,6 @@
 /****************************************************************************************
 **
-** Copyright (C) 2019-2023 Chupligin Sergey <[email protected]>
+** Copyright (C) 2019-2025 Chupligin Sergey <[email protected]>
 ** All rights reserved.
 **
 ** You may use this file under the terms of BSD license as follows:
@@ -32,6 +32,7 @@
 import QtQuick 2.6
 import QtQuick.Controls
 
+import Nemo
 import Nemo.Controls
 
 Item {

src/core/CMakeLists.txt

@@ -1,7 +1,6 @@
 set(PACKAGE nemocoreplugin)
 
 set(SRC
-    sizing.cpp
     nemoimageprovider.cpp
     plugin.cpp
     themedaemon/mlocalthemedaemonclient.cpp
@@ -17,8 +16,7 @@ set(HEADERS
     themedaemon/mabstractthemedaemonclient.h)
 
 set(PUBLIC_HEADERS
-    theme.h
-    sizing.h)
+    theme.h)
 
 add_library(${PACKAGE} SHARED ${SRC} ${MLITE})
 add_definitions( -DQT_INSTALL_QML="${QT_INSTALL_QML}")

src/core/plugin.cpp

@@ -20,7 +20,6 @@
 
 #include "plugin.h"
 #include "nemoimageprovider.h"
-#include "sizing.h"
 #include "theme.h"
 #include <QtQml>