feat: Disable homepage

1.Disable homepage 2.Update weight pms: TASK-361721
linuxdeepin · Dec 13, 2024 · f4c8d52 · f4c8d52
1 parent 667dbe4
commit f4c8d52
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 10 deletions.
diff --git a/qml/DccWindow.qml b/qml/DccWindow.qml
@@ -99,14 +99,15 @@ D.ApplicationWindow {
         id: rootLayout
         SwipeView {
             id: stackView
-            currentIndex: 0
+            currentIndex: 1
             interactive: false
             HomePage {
                 id: homePage
+                visible: false
             }
             SecondPage {
                 id: secondPage
-                visible: false
+                // visible: false
             }
             Timer {
                 id: hideTimer

diff --git a/qml/SecondPage.qml b/qml/SecondPage.qml
@@ -108,8 +108,16 @@ SplitView {
                 Layout.margins: 10
                 implicitHeight: 16
                 implicitWidth: 16
+                visible: DccApp.activeObject.parentName.length !== 0 && DccApp.activeObject.parentName !== "root"
                 onClicked: DccApp.toBack()
             }
+            Item {
+                Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
+                Layout.margins: 10
+                implicitHeight: 16
+                implicitWidth: 16
+                visible: !breakBut.visible
+            }
 
             Crumb {
                 implicitHeight: parent.implicitHeight

diff --git a/qml/plugins_v1.0/device/device.qml b/qml/plugins_v1.0/device/device.qml
@@ -8,5 +8,5 @@ DccObject {
     parentName: "root"
     displayName: qsTr("device")
     icon: "hardware"
-    weight: 60
+    weight: 40
 }
diff --git a/qml/plugins_v1.0/system/system.qml b/qml/plugins_v1.0/system/system.qml
@@ -13,7 +13,7 @@ DccObject {
     parentName: "root"
     displayName: qsTr("system")
     icon: "commoninfo"
-    weight: 30
+    weight: 10
 
     DccTitleObject {
         name: "common"

diff --git a/src/dde-control-center/dccmanager.cpp b/src/dde-control-center/dccmanager.cpp
@@ -61,6 +61,7 @@ DccManager::DccManager(QObject *parent)
     initConfig();
     connect(m_plugins, &PluginManager::addObject, this, &DccManager::addObject, Qt::QueuedConnection);
     connect(qApp, &QCoreApplication::aboutToQuit, this, &DccManager::onQuit);
+    showPage("system");
 }
 
 DccManager::~DccManager()
@@ -468,6 +469,13 @@ void DccManager::doShowPage(DccObject *obj, const QString &cmd)
     if (m_plugins->isDeleting() || !obj) {
         return;
     }
+    // 禁用首页
+    if (obj == m_root) {
+        if (m_root->getChildren().isEmpty()) {
+            return;
+        }
+        obj = m_root->getChildren().first();
+    }
     if (m_activeObject == obj && cmd.isEmpty()) {
         return;
     }
@@ -631,12 +639,13 @@ void DccManager::onObjectRemoved(DccObject *obj)
         m_searchModel->removeSearchData(o, QString());
         objs.append(o->getChildren());
     }
-
+    DccObject *parentObj = m_root;
     for (auto &&o : m_currentObjects) {
         if (o == obj) {
-            doShowPage(m_root, QString());
+            doShowPage(parentObj, QString());
             break;
         }
+        parentObj = o;
     }
 }
 

diff --git a/src/plugin-accounts/qml/accounts.qml b/src/plugin-accounts/qml/accounts.qml
@@ -9,6 +9,6 @@ DccObject {
     displayName: qsTr("Account")
     description: qsTr("Account manager")
     icon: "dcc_nav_accounts"
-    weight: 10
+    weight: 60
 }
 
diff --git a/src/plugin-deepinid/qml/deepinid.qml b/src/plugin-deepinid/qml/deepinid.qml
@@ -11,7 +11,7 @@ DccObject {
     displayName: DccApp.uosEdition() === DccApp.UosCommunity ? qsTr("deepin ID") : qsTr("UOS ID")
     description: qsTr("Cloud services")
     icon: "deepinid"
-    weight: 20
+    weight: 70
 
     visible: false
     DccDBusInterface {

diff --git a/src/plugin-personalization/qml/personalization.qml b/src/plugin-personalization/qml/personalization.qml
@@ -7,5 +7,5 @@ DccObject {
     parentName: "root"
     displayName: qsTr("Personalization")
     icon: "personalization"
-    weight: 70
+    weight: 30
 }
diff --git a/src/plugin-power/qml/power.qml b/src/plugin-power/qml/power.qml
@@ -9,7 +9,7 @@ DccObject {
     displayName: qsTr("power")
     description: qsTr("Power saving settings, screen and suspend")
     icon: "power"
-    weight: 40
+    weight: 50
 
     visible: false
     DccDBusInterface {