diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d2cd14a8..33c185b58 100644 --- a/CMakeLists.txt +++ b/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" diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 4d480dd38..8345d2698 100644 --- a/example/CMakeLists.txt +++ b/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) diff --git a/example/corona-example/CMakeLists.txt b/example/corona-example/CMakeLists.txt deleted file mode 100644 index 1f34aeefd..000000000 --- a/example/corona-example/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. -# -# SPDX-License-Identifier: GPL-3.0-or-later - -add_library(ds-corona-example SHARED - examplecorona.cpp - examplecorona.h -) - -target_link_libraries(ds-corona-example PRIVATE - dde-shell-frame -) - -ds_install_package(PACKAGE org.deepin.ds.example TARGET ds-corona-example) diff --git a/example/corona-example/examplecorona.cpp b/example/corona-example/examplecorona.cpp deleted file mode 100644 index 6292fc39e..000000000 --- a/example/corona-example/examplecorona.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: GPL-3.0-or-later - -#include "examplecorona.h" - -#include "pluginfactory.h" - - -ExampleCorona::ExampleCorona(QObject *parent) - : DCorona(parent) -{ -} - -void ExampleCorona::load() -{ - DCorona::load(); -} - -void ExampleCorona::init() -{ - DCorona::init(); -} - -D_APPLET_CLASS(ExampleCorona) - -#include "examplecorona.moc" diff --git a/example/panel-example/CMakeLists.txt b/example/panel-example/CMakeLists.txt new file mode 100644 index 000000000..6cae3b585 --- /dev/null +++ b/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) diff --git a/example/panel-example/examplepanel.cpp b/example/panel-example/examplepanel.cpp new file mode 100644 index 000000000..38c423c32 --- /dev/null +++ b/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" diff --git a/example/corona-example/examplecorona.h b/example/panel-example/examplepanel.h similarity index 68% rename from example/corona-example/examplecorona.h rename to example/panel-example/examplepanel.h index a3f989ae9..179a073c1 100644 --- a/example/corona-example/examplecorona.h +++ b/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; diff --git a/example/corona-example/main.cpp b/example/panel-example/main.cpp similarity index 81% rename from example/corona-example/main.cpp rename to example/panel-example/main.cpp index 8ef428959..d3203a5f0 100644 --- a/example/corona-example/main.cpp +++ b/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 @@ -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(); diff --git a/example/corona-example/package/main.qml b/example/panel-example/package/main.qml similarity index 100% rename from example/corona-example/package/main.qml rename to example/panel-example/package/main.qml diff --git a/example/corona-example/package/metadata.json b/example/panel-example/package/metadata.json similarity index 100% rename from example/corona-example/package/metadata.json rename to example/panel-example/package/metadata.json diff --git a/frame/CMakeLists.txt b/frame/CMakeLists.txt index 111fbb2d1..9f771bf2d 100644 --- a/frame/CMakeLists.txt +++ b/frame/CMakeLists.txt @@ -9,7 +9,7 @@ set(PUBLIC_HEADERS pluginfactory.h applet.h containment.h - corona.h + panel.h qmlengine.h layershell/dlayershellwindow.h ) @@ -17,7 +17,7 @@ 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 diff --git a/frame/corona.cpp b/frame/panel.cpp similarity index 76% rename from frame/corona.cpp rename to frame/panel.cpp index 35f9d7ce7..ce8727e49 100644 --- a/frame/corona.cpp +++ b/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 list = m_applets; diff --git a/frame/corona.h b/frame/panel.h similarity index 71% rename from frame/corona.h rename to frame/panel.h index 13370652b..4327efc09 100644 --- a/frame/corona.h +++ b/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; diff --git a/frame/private/corona_p.h b/frame/private/panel_p.h similarity index 74% rename from frame/private/corona_p.h rename to frame/private/panel_p.h index 9e72e830a..bfbbde690 100644 --- a/frame/private/corona_p.h +++ b/frame/private/panel_p.h @@ -5,7 +5,7 @@ #pragma once #include "containment_p.h" -#include "corona.h" +#include "panel.h" #include #include @@ -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 diff --git a/coronas/CMakeLists.txt b/panels/CMakeLists.txt similarity index 100% rename from coronas/CMakeLists.txt rename to panels/CMakeLists.txt diff --git a/coronas/osd/CMakeLists.txt b/panels/osd/CMakeLists.txt similarity index 66% rename from coronas/osd/CMakeLists.txt rename to panels/osd/CMakeLists.txt index 2d8227e4a..e07b5e581 100644 --- a/coronas/osd/CMakeLists.txt +++ b/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) diff --git a/coronas/osd/audio/CMakeLists.txt b/panels/osd/audio/CMakeLists.txt similarity index 100% rename from coronas/osd/audio/CMakeLists.txt rename to panels/osd/audio/CMakeLists.txt diff --git a/coronas/osd/audio/audioapplet.cpp b/panels/osd/audio/audioapplet.cpp similarity index 100% rename from coronas/osd/audio/audioapplet.cpp rename to panels/osd/audio/audioapplet.cpp diff --git a/coronas/osd/audio/audioapplet.h b/panels/osd/audio/audioapplet.h similarity index 100% rename from coronas/osd/audio/audioapplet.h rename to panels/osd/audio/audioapplet.h diff --git a/coronas/osd/audio/package/icons/osd_volume_0.dci b/panels/osd/audio/package/icons/osd_volume_0.dci similarity index 100% rename from coronas/osd/audio/package/icons/osd_volume_0.dci rename to panels/osd/audio/package/icons/osd_volume_0.dci diff --git a/coronas/osd/audio/package/icons/osd_volume_100.dci b/panels/osd/audio/package/icons/osd_volume_100.dci similarity index 100% rename from coronas/osd/audio/package/icons/osd_volume_100.dci rename to panels/osd/audio/package/icons/osd_volume_100.dci diff --git a/coronas/osd/audio/package/icons/osd_volume_33.dci b/panels/osd/audio/package/icons/osd_volume_33.dci similarity index 100% rename from coronas/osd/audio/package/icons/osd_volume_33.dci rename to panels/osd/audio/package/icons/osd_volume_33.dci diff --git a/coronas/osd/audio/package/icons/osd_volume_66.dci b/panels/osd/audio/package/icons/osd_volume_66.dci similarity index 100% rename from coronas/osd/audio/package/icons/osd_volume_66.dci rename to panels/osd/audio/package/icons/osd_volume_66.dci diff --git a/coronas/osd/audio/package/icons/osd_volume_more.dci b/panels/osd/audio/package/icons/osd_volume_more.dci similarity index 100% rename from coronas/osd/audio/package/icons/osd_volume_more.dci rename to panels/osd/audio/package/icons/osd_volume_more.dci diff --git a/coronas/osd/audio/package/icons/osd_volume_mute.dci b/panels/osd/audio/package/icons/osd_volume_mute.dci similarity index 100% rename from coronas/osd/audio/package/icons/osd_volume_mute.dci rename to panels/osd/audio/package/icons/osd_volume_mute.dci diff --git a/coronas/osd/audio/package/main.qml b/panels/osd/audio/package/main.qml similarity index 100% rename from coronas/osd/audio/package/main.qml rename to panels/osd/audio/package/main.qml diff --git a/coronas/osd/audio/package/metadata.json b/panels/osd/audio/package/metadata.json similarity index 100% rename from coronas/osd/audio/package/metadata.json rename to panels/osd/audio/package/metadata.json diff --git a/coronas/osd/brightness/CMakeLists.txt b/panels/osd/brightness/CMakeLists.txt similarity index 100% rename from coronas/osd/brightness/CMakeLists.txt rename to panels/osd/brightness/CMakeLists.txt diff --git a/coronas/osd/brightness/brightnessapplet.cpp b/panels/osd/brightness/brightnessapplet.cpp similarity index 100% rename from coronas/osd/brightness/brightnessapplet.cpp rename to panels/osd/brightness/brightnessapplet.cpp diff --git a/coronas/osd/brightness/brightnessapplet.h b/panels/osd/brightness/brightnessapplet.h similarity index 100% rename from coronas/osd/brightness/brightnessapplet.h rename to panels/osd/brightness/brightnessapplet.h diff --git a/coronas/osd/brightness/package/icons/osd_brightness0.dci b/panels/osd/brightness/package/icons/osd_brightness0.dci similarity index 100% rename from coronas/osd/brightness/package/icons/osd_brightness0.dci rename to panels/osd/brightness/package/icons/osd_brightness0.dci diff --git a/coronas/osd/brightness/package/icons/osd_brightness100.dci b/panels/osd/brightness/package/icons/osd_brightness100.dci similarity index 100% rename from coronas/osd/brightness/package/icons/osd_brightness100.dci rename to panels/osd/brightness/package/icons/osd_brightness100.dci diff --git a/coronas/osd/brightness/package/icons/osd_brightness33.dci b/panels/osd/brightness/package/icons/osd_brightness33.dci similarity index 100% rename from coronas/osd/brightness/package/icons/osd_brightness33.dci rename to panels/osd/brightness/package/icons/osd_brightness33.dci diff --git a/coronas/osd/brightness/package/icons/osd_brightness66.dci b/panels/osd/brightness/package/icons/osd_brightness66.dci similarity index 100% rename from coronas/osd/brightness/package/icons/osd_brightness66.dci rename to panels/osd/brightness/package/icons/osd_brightness66.dci diff --git a/coronas/osd/brightness/package/main.qml b/panels/osd/brightness/package/main.qml similarity index 100% rename from coronas/osd/brightness/package/main.qml rename to panels/osd/brightness/package/main.qml diff --git a/coronas/osd/brightness/package/metadata.json b/panels/osd/brightness/package/metadata.json similarity index 100% rename from coronas/osd/brightness/package/metadata.json rename to panels/osd/brightness/package/metadata.json diff --git a/coronas/osd/default/CMakeLists.txt b/panels/osd/default/CMakeLists.txt similarity index 100% rename from coronas/osd/default/CMakeLists.txt rename to panels/osd/default/CMakeLists.txt diff --git a/coronas/osd/default/package/icons/osd_airplane_mode_off.dci b/panels/osd/default/package/icons/osd_airplane_mode_off.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_airplane_mode_off.dci rename to panels/osd/default/package/icons/osd_airplane_mode_off.dci diff --git a/coronas/osd/default/package/icons/osd_airplane_mode_on.dci b/panels/osd/default/package/icons/osd_airplane_mode_on.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_airplane_mode_on.dci rename to panels/osd/default/package/icons/osd_airplane_mode_on.dci diff --git a/coronas/osd/default/package/icons/osd_capslock_off.dci b/panels/osd/default/package/icons/osd_capslock_off.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_capslock_off.dci rename to panels/osd/default/package/icons/osd_capslock_off.dci diff --git a/coronas/osd/default/package/icons/osd_capslock_on.dci b/panels/osd/default/package/icons/osd_capslock_on.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_capslock_on.dci rename to panels/osd/default/package/icons/osd_capslock_on.dci diff --git a/coronas/osd/default/package/icons/osd_fn.dci b/panels/osd/default/package/icons/osd_fn.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_fn.dci rename to panels/osd/default/package/icons/osd_fn.dci diff --git a/coronas/osd/default/package/icons/osd_keyboard_off.dci b/panels/osd/default/package/icons/osd_keyboard_off.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_keyboard_off.dci rename to panels/osd/default/package/icons/osd_keyboard_off.dci diff --git a/coronas/osd/default/package/icons/osd_keyboard_on.dci b/panels/osd/default/package/icons/osd_keyboard_on.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_keyboard_on.dci rename to panels/osd/default/package/icons/osd_keyboard_on.dci diff --git a/coronas/osd/default/package/icons/osd_mic_off.dci b/panels/osd/default/package/icons/osd_mic_off.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_mic_off.dci rename to panels/osd/default/package/icons/osd_mic_off.dci diff --git a/coronas/osd/default/package/icons/osd_mic_on.dci b/panels/osd/default/package/icons/osd_mic_on.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_mic_on.dci rename to panels/osd/default/package/icons/osd_mic_on.dci diff --git a/coronas/osd/default/package/icons/osd_power_balance.dci b/panels/osd/default/package/icons/osd_power_balance.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_power_balance.dci rename to panels/osd/default/package/icons/osd_power_balance.dci diff --git a/coronas/osd/default/package/icons/osd_power_performance.dci b/panels/osd/default/package/icons/osd_power_performance.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_power_performance.dci rename to panels/osd/default/package/icons/osd_power_performance.dci diff --git a/coronas/osd/default/package/icons/osd_power_save.dci b/panels/osd/default/package/icons/osd_power_save.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_power_save.dci rename to panels/osd/default/package/icons/osd_power_save.dci diff --git a/coronas/osd/default/package/icons/osd_touchpad_exchange.dci b/panels/osd/default/package/icons/osd_touchpad_exchange.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_touchpad_exchange.dci rename to panels/osd/default/package/icons/osd_touchpad_exchange.dci diff --git a/coronas/osd/default/package/icons/osd_touchpad_off.dci b/panels/osd/default/package/icons/osd_touchpad_off.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_touchpad_off.dci rename to panels/osd/default/package/icons/osd_touchpad_off.dci diff --git a/coronas/osd/default/package/icons/osd_touchpad_on.dci b/panels/osd/default/package/icons/osd_touchpad_on.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_touchpad_on.dci rename to panels/osd/default/package/icons/osd_touchpad_on.dci diff --git a/coronas/osd/default/package/icons/osd_wifi_off.dci b/panels/osd/default/package/icons/osd_wifi_off.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_wifi_off.dci rename to panels/osd/default/package/icons/osd_wifi_off.dci diff --git a/coronas/osd/default/package/icons/osd_wifi_on.dci b/panels/osd/default/package/icons/osd_wifi_on.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_wifi_on.dci rename to panels/osd/default/package/icons/osd_wifi_on.dci diff --git a/coronas/osd/default/package/icons/osd_wm_2d.dci b/panels/osd/default/package/icons/osd_wm_2d.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_wm_2d.dci rename to panels/osd/default/package/icons/osd_wm_2d.dci diff --git a/coronas/osd/default/package/icons/osd_wm_3d.dci b/panels/osd/default/package/icons/osd_wm_3d.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_wm_3d.dci rename to panels/osd/default/package/icons/osd_wm_3d.dci diff --git a/coronas/osd/default/package/icons/osd_wm_failed.dci b/panels/osd/default/package/icons/osd_wm_failed.dci similarity index 100% rename from coronas/osd/default/package/icons/osd_wm_failed.dci rename to panels/osd/default/package/icons/osd_wm_failed.dci diff --git a/coronas/osd/default/package/main.qml b/panels/osd/default/package/main.qml similarity index 100% rename from coronas/osd/default/package/main.qml rename to panels/osd/default/package/main.qml diff --git a/coronas/osd/default/package/metadata.json b/panels/osd/default/package/metadata.json similarity index 100% rename from coronas/osd/default/package/metadata.json rename to panels/osd/default/package/metadata.json diff --git a/coronas/osd/displaymode/CMakeLists.txt b/panels/osd/displaymode/CMakeLists.txt similarity index 100% rename from coronas/osd/displaymode/CMakeLists.txt rename to panels/osd/displaymode/CMakeLists.txt diff --git a/coronas/osd/displaymode/displaymodeapplet.cpp b/panels/osd/displaymode/displaymodeapplet.cpp similarity index 100% rename from coronas/osd/displaymode/displaymodeapplet.cpp rename to panels/osd/displaymode/displaymodeapplet.cpp diff --git a/coronas/osd/displaymode/displaymodeapplet.h b/panels/osd/displaymode/displaymodeapplet.h similarity index 100% rename from coronas/osd/displaymode/displaymodeapplet.h rename to panels/osd/displaymode/displaymodeapplet.h diff --git a/coronas/osd/displaymode/package/icons/osd_display_copy.dci b/panels/osd/displaymode/package/icons/osd_display_copy.dci similarity index 100% rename from coronas/osd/displaymode/package/icons/osd_display_copy.dci rename to panels/osd/displaymode/package/icons/osd_display_copy.dci diff --git a/coronas/osd/displaymode/package/icons/osd_display_custom1.dci b/panels/osd/displaymode/package/icons/osd_display_custom1.dci similarity index 100% rename from coronas/osd/displaymode/package/icons/osd_display_custom1.dci rename to panels/osd/displaymode/package/icons/osd_display_custom1.dci diff --git a/coronas/osd/displaymode/package/icons/osd_display_custom2.dci b/panels/osd/displaymode/package/icons/osd_display_custom2.dci similarity index 100% rename from coronas/osd/displaymode/package/icons/osd_display_custom2.dci rename to panels/osd/displaymode/package/icons/osd_display_custom2.dci diff --git a/coronas/osd/displaymode/package/icons/osd_display_expansion.dci b/panels/osd/displaymode/package/icons/osd_display_expansion.dci similarity index 100% rename from coronas/osd/displaymode/package/icons/osd_display_expansion.dci rename to panels/osd/displaymode/package/icons/osd_display_expansion.dci diff --git a/coronas/osd/displaymode/package/main.qml b/panels/osd/displaymode/package/main.qml similarity index 100% rename from coronas/osd/displaymode/package/main.qml rename to panels/osd/displaymode/package/main.qml diff --git a/coronas/osd/displaymode/package/metadata.json b/panels/osd/displaymode/package/metadata.json similarity index 100% rename from coronas/osd/displaymode/package/metadata.json rename to panels/osd/displaymode/package/metadata.json diff --git a/coronas/osd/kblayout/CMakeLists.txt b/panels/osd/kblayout/CMakeLists.txt similarity index 100% rename from coronas/osd/kblayout/CMakeLists.txt rename to panels/osd/kblayout/CMakeLists.txt diff --git a/coronas/osd/kblayout/kblayoutapplet.cpp b/panels/osd/kblayout/kblayoutapplet.cpp similarity index 100% rename from coronas/osd/kblayout/kblayoutapplet.cpp rename to panels/osd/kblayout/kblayoutapplet.cpp diff --git a/coronas/osd/kblayout/kblayoutapplet.h b/panels/osd/kblayout/kblayoutapplet.h similarity index 100% rename from coronas/osd/kblayout/kblayoutapplet.h rename to panels/osd/kblayout/kblayoutapplet.h diff --git a/coronas/osd/kblayout/package/main.qml b/panels/osd/kblayout/package/main.qml similarity index 100% rename from coronas/osd/kblayout/package/main.qml rename to panels/osd/kblayout/package/main.qml diff --git a/coronas/osd/kblayout/package/metadata.json b/panels/osd/kblayout/package/metadata.json similarity index 100% rename from coronas/osd/kblayout/package/metadata.json rename to panels/osd/kblayout/package/metadata.json diff --git a/coronas/osd/osdcorona.cpp b/panels/osd/osdpanel.cpp similarity index 71% rename from coronas/osd/osdcorona.cpp rename to panels/osd/osdpanel.cpp index d86d469c6..958c579f6 100644 --- a/coronas/osd/osdcorona.cpp +++ b/panels/osd/osdpanel.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#include "osdcorona.h" +#include "osdpanel.h" #include "pluginfactory.h" @@ -15,22 +15,22 @@ DS_BEGIN_NAMESPACE namespace osd { -OsdCorona::OsdCorona(QObject *parent) - : DCorona(parent) +OsdPanel::OsdPanel(QObject *parent) + : DPanel(parent) { } -void OsdCorona::load() +void OsdPanel::load() { QDBusConnection bus = QDBusConnection::sessionBus(); if (!bus.registerService("org.deepin.dde.Shell")) { qWarning() << "register failed" << bus.lastError().message(); } - DCorona::load(); + DPanel::load(); } -void OsdCorona::init() +void OsdPanel::init() { auto bus = QDBusConnection::sessionBus(); bus.registerObject(QStringLiteral("/org/deepin/osdService"), @@ -40,23 +40,23 @@ void OsdCorona::init() m_osdTimer = new QTimer(this); m_osdTimer->setInterval(m_interval); m_osdTimer->setSingleShot(true); - QObject::connect(m_osdTimer, &QTimer::timeout, this, &OsdCorona::hideOsd); - DCorona::init(); + QObject::connect(m_osdTimer, &QTimer::timeout, this, &OsdPanel::hideOsd); + DPanel::init(); } Q_LOGGING_CATEGORY(osdLog, "dde.shell.osd") -QString OsdCorona::osdType() const +QString OsdPanel::osdType() const { return m_osdType; } -bool OsdCorona::visible() const +bool OsdPanel::visible() const { return m_visible; } -void OsdCorona::showText(const QString &text) +void OsdPanel::showText(const QString &text) { qCInfo(osdLog()) << "show text" << text; m_osdTimer->setInterval(text == "SwitchWM3D" ? 2000 : 1000); @@ -65,13 +65,13 @@ void OsdCorona::showText(const QString &text) showOsd(); } -void OsdCorona::hideOsd() +void OsdPanel::hideOsd() { m_osdTimer->stop(); setVisible(false); } -void OsdCorona::showOsd() +void OsdPanel::showOsd() { m_osdTimer->stop(); @@ -79,7 +79,7 @@ void OsdCorona::showOsd() setVisible(true); } -void OsdCorona::setVisible(const bool visible) +void OsdPanel::setVisible(const bool visible) { if (visible == m_visible) return; @@ -87,15 +87,15 @@ void OsdCorona::setVisible(const bool visible) Q_EMIT visibleChanged(); } -void OsdCorona::setOsdType(const QString &osdType) +void OsdPanel::setOsdType(const QString &osdType) { m_osdType = osdType; emit osdTypeChanged(m_osdType); } -D_APPLET_CLASS(OsdCorona) +D_APPLET_CLASS(OsdPanel) } DS_END_NAMESPACE -#include "osdcorona.moc" +#include "osdpanel.moc" diff --git a/coronas/osd/osdcorona.h b/panels/osd/osdpanel.h similarity index 90% rename from coronas/osd/osdcorona.h rename to panels/osd/osdpanel.h index 8848a0bc4..c48abfd51 100644 --- a/coronas/osd/osdcorona.h +++ b/panels/osd/osdpanel.h @@ -4,20 +4,20 @@ #pragma once -#include "corona.h" +#include "panel.h" #include DS_BEGIN_NAMESPACE namespace osd { -class OsdCorona : public DCorona +class OsdPanel : public DPanel { Q_OBJECT Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged FINAL) Q_PROPERTY(QString osdType READ osdType NOTIFY osdTypeChanged FINAL) Q_CLASSINFO("D-Bus Interface", "org.deepin.osdService") public: - explicit OsdCorona(QObject *parent = nullptr); + explicit OsdPanel(QObject *parent = nullptr); virtual void load() override; virtual void init() override; diff --git a/coronas/osd/package/main.qml b/panels/osd/package/main.qml similarity index 100% rename from coronas/osd/package/main.qml rename to panels/osd/package/main.qml diff --git a/coronas/osd/package/metadata.json b/panels/osd/package/metadata.json similarity index 100% rename from coronas/osd/package/metadata.json rename to panels/osd/package/metadata.json diff --git a/coronas/osd/test.sh b/panels/osd/test.sh similarity index 100% rename from coronas/osd/test.sh rename to panels/osd/test.sh diff --git a/shell/main.cpp b/shell/main.cpp index 2852957ba..a83546475 100644 --- a/shell/main.cpp +++ b/shell/main.cpp @@ -34,8 +34,8 @@ int main(int argc, char *argv[]) parser.addHelpOption(); parser.addVersionOption(); - QCommandLineOption coronaOption("c", "collections of corona.", "corona", QString()); - parser.addOption(coronaOption); + QCommandLineOption panelOption("p", "collections of panel.", "panel", QString()); + parser.addOption(panelOption); QCommandLineOption testOption(QStringList() << "t" << "test", "application test."); parser.addOption(testOption); QCommandLineOption disableAppletOption("d", "disabled applet.", "disable-applet", QString()); @@ -65,8 +65,8 @@ int main(int argc, char *argv[]) QList applets; if (parser.isSet(testOption)) { pluginIds << "org.deepin.ds.example"; - } else if (parser.isSet(coronaOption)) { - pluginIds << parser.values(coronaOption); + } else if (parser.isSet(panelOption)) { + pluginIds << parser.values(panelOption); } else { for (auto item : DPluginLoader::instance()->rootPlugins()) { pluginIds << item.pluginId();