fix: Version not match when build outside dde-dock project

CMakeLists.txt

@@ -1,21 +1,29 @@
 
 set(PLUGIN_NAME "pineappledatetime")
+# set(CMAKE_VERBOSE_MAKEFILE 1)
+
 
 project(${PLUGIN_NAME})
 
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_CXX_FLAGS "-g -Wall")
+
 # Sources files
-file(GLOB SRCS "*.h" "*.cpp")
+file(GLOB SRCS "*.h" "*.cpp" "/usr/include/dde-dock/*.h")
 
 find_package(PkgConfig REQUIRED)
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5Svg REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(DtkWidget REQUIRED)
 
-add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
+add_definitions("-DQT_PLUGIN ${QT_DEFINITIONS}")
 add_library(${PLUGIN_NAME} SHARED ${SRCS} resources.qrc)
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
-target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} ../../interfaces)
+target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} /usr/include/dde-dock)
 target_link_libraries(${PLUGIN_NAME} PRIVATE
  ${Qt5DBus_LIBRARIES}
  ${DtkWidget_LIBRARIES}

README.md

@@ -1,5 +1,7 @@
 ## dde-dock datetime plugin (modified version)
 
+*Please notice that this is **NOT** an official project*
+
 ### Info
 
 Simple quick hack to make it display year/month/day on it's `Dock::Efficient` mode (`24HourFormat` only). Also some really little simple tweak to make it compilable without fetching the full dde-dock repo.
@@ -10,7 +12,7 @@ Current codebase is fork from [dde-dock#39c1a6b](https://github.com/linuxdeepin/
 
 You need do `apt-get build-dep dde-dock` first.
 
-To compile:
+To compile and run:
 
 ``` bash
 # you should clone it first:
@@ -21,6 +23,16 @@ cd build/
 cmake ../
 make
 # then you got `libpineappledatetime.so`
-# this will copy this into `/usr/`
-sudo make install
+# this will copy this into `/usr/lib/dde-dock/plugins/`
+# p.s. `make install` will copy the lib to `/usr/share/lib/dde-dock/plugins`
+# but it seems `dde-dock` doesn't scan that path by default...
+sudo cp ../libpineappledatetime.so /usr/lib/dde-dock/plugins/
+# finally, restart `dde-dock` (kill it and dde will restart it automatically)
+killall dde-dock
 ```
+
+Then done!
+
+### License
+
+GPLv3 (as required, same as original license)

datetimeplugin.cpp

@@ -2,8 +2,10 @@
  * Copyright (C) 2011 ~ 2018 Deepin Technology Co., Ltd.
  *
  * Author: sbw <[email protected]>
+ * blumia <[email protected]>
  *
  * Maintainer: sbw <[email protected]>
+ * blumia <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

datetimeplugin.h

@@ -2,8 +2,10 @@
  * Copyright (C) 2011 ~ 2018 Deepin Technology Co., Ltd.
  *
  * Author: sbw <[email protected]>
+ * blumia <[email protected]>
  *
  * Maintainer: sbw <[email protected]>
+ * blumia <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +35,7 @@ class DatetimePlugin : public QObject, PluginsItemInterface
 {
  Q_OBJECT
  Q_INTERFACES(PluginsItemInterface)
- Q_PLUGIN_METADATA(IID "com.deepin.dock.PluginsItemInterface" FILE "datetime.json")
+ Q_PLUGIN_METADATA(IID "com.deepin.dock.PluginsItemInterface" FILE "pineappledatetime.json")
 
 public:
  explicit DatetimePlugin(QObject *parent = 0);
@@ -43,7 +45,10 @@ class DatetimePlugin : public QObject, PluginsItemInterface
  void init(PluginProxyInterface *proxyInter) override;
 
  void pluginStateSwitched() override;
- bool pluginIsAllowDisable() override { return true; }
+ bool pluginIsAllowDisable() override
+ {
+ return true;
+ }
  bool pluginIsDisable() override;
 
  int itemSortKey(const QString &itemKey);

datetimewidget.cpp

@@ -2,8 +2,10 @@
  * Copyright (C) 2011 ~ 2018 Deepin Technology Co., Ltd.
  *
  * Author: sbw <[email protected]>
+ * blumia <[email protected]>
  *
  * Maintainer: sbw <[email protected]>
+ * blumia <[email protected]>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by