chore: rename 'corona' to 'panel'

  rename top layer.

CMakeLists.txt

@@ -56,7 +56,7 @@ find_package(PkgConfig REQUIRED)
 add_subdirectory(frame)
 add_subdirectory(shell)
 add_subdirectory(example)
-add_subdirectory(coronas)
+add_subdirectory(panels)
 
 configure_package_config_file(
     "${CMAKE_CURRENT_LIST_DIR}/misc/DDEShellConfig.cmake.in"

example/CMakeLists.txt

@@ -7,6 +7,6 @@ find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Co
 add_subdirectory(applet-example)
 add_subdirectory(applet-example-data)
 add_subdirectory(containment-example)
-add_subdirectory(corona-example)
+add_subdirectory(panel-example)
 add_subdirectory(layershell-example)
 add_subdirectory(osd-example)

example/panel-example/CMakeLists.txt

@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+add_library(ds-panel-example SHARED
+    examplepanel.cpp
+    examplepanel.h
+)
+
+target_link_libraries(ds-panel-example PRIVATE
+    dde-shell-frame
+)
+
+ds_install_package(PACKAGE org.deepin.ds.example TARGET ds-panel-example)

example/panel-example/examplepanel.cpp

@@ -0,0 +1,27 @@
+// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "examplepanel.h"
+
+#include "pluginfactory.h"
+
+
+ExamplePanel::ExamplePanel(QObject *parent)
+    : DPanel(parent)
+{
+}
+
+void ExamplePanel::load()
+{
+    DPanel::load();
+}
+
+void ExamplePanel::init()
+{
+    DPanel::init();
+}
+
+D_APPLET_CLASS(ExamplePanel)
+
+#include "examplepanel.moc"

example/corona-example/examplecorona.h → example/panel-example/examplepanel.h

@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include "corona.h"
+#include "panel.h"
 
 DS_USE_NAMESPACE
 
-class ExampleCorona : public DCorona
+class ExamplePanel : public DPanel
 {
     Q_OBJECT
 public:
-    explicit ExampleCorona(QObject *parent = nullptr);
+    explicit ExamplePanel(QObject *parent = nullptr);
 
     void load() override;
 

example/corona-example/main.cpp → example/panel-example/main.cpp

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "panelview.h"
-#include "examplecorona.h"
+#include "examplepanel.h"
 #include "pluginloader.h"
 
 #include <QGuiApplication>
@@ -17,10 +17,10 @@ int main(int argc, char *argv[])
 
     DPluginLoader::instance()->addPackageDir("/home/repo/dde-shell/example");
 
-    ExampleCorona corona;
-    corona.load();
+    ExamplePanel panel;
+    panel.load();
 
-    auto view = corona.view();
+    auto view = panel.view();
     view->resize(600, 400);
     view->show();
 

frame/CMakeLists.txt

@@ -9,15 +9,15 @@ set(PUBLIC_HEADERS
     pluginfactory.h
     applet.h
     containment.h
-    corona.h
+    panel.h
     qmlengine.h
     layershell/dlayershellwindow.h
 )
 add_library(dde-shell-frame SHARED
     ${PUBLIC_HEADERS}
     private/applet_p.h
     private/containment_p.h
-    private/corona_p.h
+    private/panel_p.h
     private/appletitem_p.h
     appletitem.h
     containmentitem.h
@@ -27,7 +27,7 @@ add_library(dde-shell-frame SHARED
     pluginfactory.cpp
     applet.cpp
     containment.cpp
-    corona.cpp
+    panel.cpp
     appletitem.cpp
     containmentitem.cpp
     qmlengine.cpp

frame/corona.cpp → frame/panel.cpp

@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "corona.h"
-#include "private/corona_p.h"
+#include "panel.h"
+#include "private/panel_p.h"
 
 #include "qmlengine.h"
 
@@ -16,31 +16,31 @@ DS_BEGIN_NAMESPACE
 
 Q_DECLARE_LOGGING_CATEGORY(dsLog)
 
-DCorona::DCorona(QObject *parent)
-    : DContainment(*new DCoronaPrivate(this), parent)
+DPanel::DPanel(QObject *parent)
+    : DContainment(*new DPanelPrivate(this), parent)
 {
 }
 
-DCorona::~DCorona()
+DPanel::~DPanel()
 {
 
 }
 
-QQuickWindow *DCorona::window() const
+QQuickWindow *DPanel::window() const
 {
-    D_DC(DCorona);
+    D_DC(DPanel);
     return d->m_window;
 }
 
-void DCorona::load()
+void DPanel::load()
 {
-    D_D(DCorona);
+    D_D(DPanel);
     DContainment::load();
 }
 
-void DCorona::init()
+void DPanel::init()
 {
-    D_D(DCorona);
+    D_D(DPanel);
     d->initDciSearchPaths();
 
     auto applet = this;
@@ -60,9 +60,9 @@ void DCorona::init()
     engine->completeCreate();
 }
 
-void DCoronaPrivate::initDciSearchPaths()
+void DPanelPrivate::initDciSearchPaths()
 {
-    D_Q(DCorona);
+    D_Q(DPanel);
     DGUI_USE_NAMESPACE;
     auto dciPaths = DIconTheme::dciThemeSearchPaths();
     QList<DApplet *> list = m_applets;

frame/corona.h → frame/panel.h

@@ -14,14 +14,14 @@ DS_BEGIN_NAMESPACE
 /**
  * @brief 插件集
  */
-class DCoronaPrivate;
-class DS_SHARE DCorona : public DContainment
+class DPanelPrivate;
+class DS_SHARE DPanel : public DContainment
 {
     Q_OBJECT
-    D_DECLARE_PRIVATE(DCorona)
+    D_DECLARE_PRIVATE(DPanel)
 public:
-    explicit DCorona(QObject *parent = nullptr);
-    virtual ~DCorona() override;
+    explicit DPanel(QObject *parent = nullptr);
+    virtual ~DPanel() override;
 
     QQuickWindow *window() const;
 

frame/private/corona_p.h → frame/private/panel_p.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include "containment_p.h"
-#include "corona.h"
+#include "panel.h"
 
 #include <dobject_p.h>
 #include <QVariant>
@@ -14,10 +14,10 @@ DS_BEGIN_NAMESPACE
 /**
  * @brief 插件项
  */
-class DCoronaPrivate : public DContainmentPrivate
+class DPanelPrivate : public DContainmentPrivate
 {
 public:
-    explicit DCoronaPrivate(DCorona *qq)
+    explicit DPanelPrivate(DPanel *qq)
         : DContainmentPrivate(qq)
     {
 
@@ -27,7 +27,7 @@ class DCoronaPrivate : public DContainmentPrivate
 
     QQuickWindow *m_window = nullptr;
 
-    D_DECLARE_PUBLIC(DCorona)
+    D_DECLARE_PUBLIC(DPanel)
 };
 
 DS_END_NAMESPACE

coronas/osd/CMakeLists.txt → panels/osd/CMakeLists.txt

@@ -2,18 +2,18 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-add_library(osdcorona SHARED
-    osdcorona.cpp
-    osdcorona.h
+add_library(osdpanel SHARED
+    osdpanel.cpp
+    osdpanel.h
     test.sh
 )
 
-target_link_libraries(osdcorona PRIVATE
+target_link_libraries(osdpanel PRIVATE
     dde-shell-frame
     Qt${QT_MAJOR_VERSION}::DBus
 )
 
-ds_install_package(PACKAGE org.deepin.ds.osd TARGET osdcorona)
+ds_install_package(PACKAGE org.deepin.ds.osd TARGET osdpanel)
 
 add_subdirectory(default)
 add_subdirectory(audio)