Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: 整理代码结构

Browse Source 
对代码文件的include全部设置设置引用路径，删除用不到的代码文件

Log: 整理代码结构
Change-Id: I9582022d38083a5380f1952e434d8b4d71c98d62
This commit is contained in:
Fan PengCheng 2021-04-07 10:41:13 +08:00
parent dc4074b4bd
commit 5300364d3a
14 changed files with 83 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -51,44 +51,40 @@ file(GLOB INTERFACES "interfaces/*.h")
#单元测试的CMakeLists和主程序的CMakeLists路径不同，编译单元测试时会提示找不到文件 #单元测试的CMakeLists和主程序的CMakeLists路径不同，编译单元测试时会提示找不到文件
#因此设置搜索路径 #因此设置搜索路径
include_directories( include_directories(
frame/accessible
frame/controller frame/controller
frame/dbus frame/dbus
frame/dbus/sni frame/dbus/sni
frame/item frame/item
frame/item/components frame/item/components
frame/item/resources frame/item/resources
frame/panel
frame/qss
frame/util frame/util
frame/window frame/window
frame/xcb frame/xcb
frame/mockinterface ../widgets
../interfaces
) )
aux_source_directory(frame/accessible ACCESSIBLE)
aux_source_directory(frame/controller CONTROLLER) aux_source_directory(frame/controller CONTROLLER)
aux_source_directory(frame/dbus DBUS) aux_source_directory(frame/dbus DBUS)
aux_source_directory(frame/dbus/sni SNI) aux_source_directory(frame/dbus/sni SNI)
aux_source_directory(frame/item ITEM) aux_source_directory(frame/item ITEM)
aux_source_directory(frame/item/components COMPONENTS) aux_source_directory(frame/item/components COMPONENTS)
aux_source_directory(frame/item/resources RESOURCES) aux_source_directory(frame/item/resources RESOURCES)
aux_source_directory(frame/panel PANEL)
aux_source_directory(frame/qss QSSPATH)
aux_source_directory(frame/util UTIL) aux_source_directory(frame/util UTIL)
aux_source_directory(frame/window WINDOW) aux_source_directory(frame/window WINDOW)
aux_source_directory(frame/xcb XCB) aux_source_directory(frame/xcb XCB)
aux_source_directory(frame/mockinterface MOCKINTERFACE)
file(GLOB SRC_PATH file(GLOB SRC_PATH
${ACCESSIBLE}
${CONTROLLER} ${CONTROLLER}
${DBUS} ${DBUS}
${SNI} ${SNI}
${ITEM} ${ITEM}
${COMPONENTS} ${COMPONENTS}
${PANEL}
${UTIL} ${UTIL}
${WINDOW} ${WINDOW}
${XCB} ${XCB}
${MOCKINTERFACE}
) )
add_subdirectory("frame") add_subdirectory("frame")

19
frame/CMakeLists.txt
View File

@ -23,7 +23,7 @@ pkg_check_modules(QGSettings REQUIRED gsettings-qt)
pkg_check_modules(DtkGUI REQUIRED dtkgui) pkg_check_modules(DtkGUI REQUIRED dtkgui)
# driver-manager # driver-manager
add_executable(${BIN_NAME} ${SRCS} ${INTERFACES} ${SRC_PATH} item/item.qrc frame.qrc) add_executable(${BIN_NAME} ${SRCS} ${INTERFACES} ${SRC_PATH} item/item.qrc)
target_include_directories(${BIN_NAME} PUBLIC target_include_directories(${BIN_NAME} PUBLIC
${DtkWidget_INCLUDE_DIRS} ${DtkWidget_INCLUDE_DIRS}
@ -35,7 +35,24 @@ target_include_directories(${BIN_NAME} PUBLIC
${DtkGUI_INCLUDE_DIRS} ${DtkGUI_INCLUDE_DIRS}
${Qt5Svg_INCLUDE_DIRS} ${Qt5Svg_INCLUDE_DIRS}
../interfaces ../interfaces
../widgets
accessible
controller
dbus
item
item/components
util util
window
xcb
../plugins/tray
../plugins/show-desktop
../plugins/network
../plugins/datetime
../plugins/onboard
../plugins/trash
../plugins/shutdown
../plugins/multitasking
../plugins/overlay-warning
) )
target_link_libraries(${BIN_NAME} PRIVATE target_link_libraries(${BIN_NAME} PRIVATE

70
frame/window/accessible.h → frame/accessible/accessible.h
View File

@ -1,33 +1,33 @@
#include "accessibledefine.h" #include "accessibledefine.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "../panel/mainpanelcontrol.h" #include "mainpanelcontrol.h"
#include "../../widgets/tipswidget.h" #include "tipswidget.h"
#include "../util/dockpopupwindow.h" #include "dockpopupwindow.h"
#include "util/statebutton.h" #include "statebutton.h"
#include "../item/launcheritem.h" #include "launcheritem.h"
#include "../item/appitem.h" #include "appitem.h"
#include "../item/components/previewcontainer.h" #include "components/previewcontainer.h"
#include "../item/pluginsitem.h" #include "pluginsitem.h"
#include "../item/traypluginitem.h" #include "traypluginitem.h"
#include "../item/placeholderitem.h" #include "placeholderitem.h"
#include "../item/components/appdragwidget.h" #include "components/appdragwidget.h"
#include "../item/components/appsnapshot.h" #include "components/appsnapshot.h"
#include "../item/components/floatingpreview.h" #include "components/floatingpreview.h"
#include "../plugins/tray/snitraywidget.h" #include "snitraywidget.h"
#include "../plugins/tray/abstracttraywidget.h" #include "abstracttraywidget.h"
#include "../plugins/tray/indicatortraywidget.h" #include "indicatortraywidget.h"
#include "../plugins/tray/xembedtraywidget.h" #include "xembedtraywidget.h"
#include "../plugins/tray/system-trays/systemtrayitem.h" #include "system-trays/systemtrayitem.h"
#include "../plugins/tray/fashiontray/fashiontrayitem.h" #include "fashiontray/fashiontrayitem.h"
#include "../plugins/tray/fashiontray/fashiontraywidgetwrapper.h" #include "fashiontray/fashiontraywidgetwrapper.h"
#include "../plugins/tray/fashiontray/fashiontraycontrolwidget.h" #include "fashiontray/fashiontraycontrolwidget.h"
#include "../plugins/tray/fashiontray/containers/attentioncontainer.h" #include "fashiontray/containers/attentioncontainer.h"
#include "../plugins/tray/fashiontray/containers/holdcontainer.h" #include "fashiontray/containers/holdcontainer.h"
#include "../plugins/tray/fashiontray/containers/normalcontainer.h" #include "fashiontray/containers/normalcontainer.h"
#include "../plugins/tray/fashiontray/containers/spliteranimated.h" #include "fashiontray/containers/spliteranimated.h"
// 这部分由sound插件单独维护,这样做是因为在标记volumeslider这个类时,需要用到其setValue的实现, // 这部分由sound插件单独维护,这样做是因为在标记volumeslider这个类时,需要用到其setValue的实现,
// 但插件的源文件dock这边并没有包含,不想引入复杂的包含关系,其实最好的做法就是像sound插件这样,谁维护谁的 // 但插件的源文件dock这边并没有包含,不想引入复杂的包含关系,其实最好的做法就是像sound插件这样,谁维护谁的
@ -37,16 +37,16 @@
//#include "../plugins/sound/componments/volumeslider.h" //#include "../plugins/sound/componments/volumeslider.h"
//#include "../plugins/sound/componments/horizontalseparator.h" //#include "../plugins/sound/componments/horizontalseparator.h"
#include "../plugins/show-desktop/showdesktopwidget.h" #include "showdesktopwidget.h"
#include "../plugins/network/networkitem.h" #include "networkitem.h"
#include "../plugins/network/item/applet/devicecontrolwidget.h" #include "item/applet/devicecontrolwidget.h"
#include "../plugins/datetime/datetimewidget.h" #include "datetimewidget.h"
#include "../plugins/onboard/onboarditem.h" #include "onboarditem.h"
#include "../plugins/trash/trashwidget.h" #include "trashwidget.h"
#include "../plugins/trash/popupcontrolwidget.h" #include "popupcontrolwidget.h"
#include "../plugins/shutdown/shutdownwidget.h" #include "shutdownwidget.h"
#include "../plugins/multitasking/multitaskingwidget.h" #include "multitaskingwidget.h"
#include "../plugins/overlay-warning/overlaywarningwidget.h" #include "overlaywarningwidget.h"
#include <DIconButton> #include <DIconButton>
#include <DSwitchButton> #include <DSwitchButton>

0
frame/window/accessibledefine.h → frame/accessible/accessibledefine.h
View File

5
frame/frame.qrc
View File

@ -1,5 +0,0 @@
<RCC>
<qresource prefix="/">
<file>qss/frame.qss</file>
</qresource>
</RCC>

2
frame/item/dockitem.cpp
View File

@ -20,7 +20,7 @@
*/ */
#include "dockitem.h" #include "dockitem.h"
#include "components/hoverhighlighteffect.h" #include "hoverhighlighteffect.h"
#include "pluginsitem.h" #include "pluginsitem.h"
#include <QMouseEvent> #include <QMouseEvent>

14
frame/main.cpp
View File

@ -19,13 +19,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "window/mainwindow.h" #include "mainwindow.h"
#include "window/accessible.h" #include "accessible.h"
#include "dbus/dbusdockadaptors.h" #include "dbusdockadaptors.h"
#include "util/utils.h" #include "utils.h"
#include "util/themeappicon.h" #include "themeappicon.h"
#include "controller/dockitemmanager.h" #include "dockitemmanager.h"
#include "util/dockapplication.h" #include "dockapplication.h"
#include <QAccessible> #include <QAccessible>
#include <QDir> #include <QDir>

19
frame/qss/frame.qss
View File

@ -1,19 +0,0 @@
#MainPanel[position='0'] {
padding: 0 0px;
border-top: none;
}
#MainPanel[position='1'] {
padding: 0px 0;
border-right: none;
}
#MainPanel[position='2'] {
padding:0 0px;
border-bottom: none;
}
#MainPanel[position='3'] {
padding: 0px 0;
border-left: none;
}

2
frame/util/themeappicon.cpp
View File

@ -31,7 +31,7 @@
#include <QLabel> #include <QLabel>
#include <QDate> #include <QDate>
#include "../frame/util/imageutil.h" #include "imageutil.h"
ThemeAppIcon::ThemeAppIcon(QObject *parent) : QObject(parent) ThemeAppIcon::ThemeAppIcon(QObject *parent) : QObject(parent)
{ {

0
frame/panel/mainpanelcontrol.cpp → frame/window/mainpanelcontrol.cpp
View File

0
frame/panel/mainpanelcontrol.h → frame/window/mainpanelcontrol.h
View File

25
plugins/sound/CMakeLists.txt
View File

@ -19,17 +19,20 @@ add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
add_library(${PLUGIN_NAME} SHARED ${SRCS} resources/sound.qrc) add_library(${PLUGIN_NAME} SHARED ${SRCS} resources/sound.qrc)
set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../system-trays) set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../system-trays)
target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS}
${DFrameworkDBus_INCLUDE_DIRS} ${DFrameworkDBus_INCLUDE_DIRS}
${QGSettings_INCLUDE_DIRS} ${QGSettings_INCLUDE_DIRS}
../../interfaces ../../interfaces
../../frame) ../../frame
../../frame/accessible
)
target_link_libraries(${PLUGIN_NAME} PRIVATE target_link_libraries(${PLUGIN_NAME} PRIVATE
${DtkWidget_LIBRARIES} ${DtkWidget_LIBRARIES}
${DFrameworkDBus_LIBRARIES} ${DFrameworkDBus_LIBRARIES}
${QGSettings_LIBRARIES} ${QGSettings_LIBRARIES}
${Qt5DBus_LIBRARIES} ${Qt5DBus_LIBRARIES}
${Qt5Widgets_LIBRARIES} ${Qt5Widgets_LIBRARIES}
${Qt5Svg_LIBRARIES} ${Qt5Svg_LIBRARIES}
) )
install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays) install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-dock/plugins/system-trays)

2
plugins/sound/soundaccessible.h
View File

@ -1,6 +1,6 @@
#ifndef SOUNDACCESSIBLE_H #ifndef SOUNDACCESSIBLE_H
#define SOUNDACCESSIBLE_H #define SOUNDACCESSIBLE_H
#include "../frame/window/accessibledefine.h" #include "accessibledefine.h"
#include "sounditem.h" #include "sounditem.h"
#include "soundapplet.h" #include "soundapplet.h"

2
tests/CMakeLists.txt
View File

@ -31,7 +31,7 @@ pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus)
pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11) pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11)
# 添加执行文件信息 # 添加执行文件信息
add_executable(${BIN_NAME} ${SRCS} ${INTERFACES} ${SRC_PATH} ../frame/item/item.qrc ../frame/frame.qrc ut_res.qrc) add_executable(${BIN_NAME} ${SRCS} ${INTERFACES} ${SRC_PATH} ../frame/item/item.qrc ut_res.qrc)
# 包含路径 # 包含路径
target_include_directories(${BIN_NAME} PUBLIC target_include_directories(${BIN_NAME} PUBLIC