diff --git a/CMakeLists.txt b/CMakeLists.txt index 202d2b67b..d065fbfae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ include(WriteBasicConfigVersionFile) include(Definitions.cmake) -add_subdirectory(liblattedock) +add_subdirectory(liblatte2) add_subdirectory(kwin_scripts) add_subdirectory(app) add_subdirectory(containmentactions) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index bbb54be3a..754f9f4eb 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,5 +1,5 @@ set(lattedock-app_SRCS - ../liblattedock/dock.cpp + ../liblatte2/types.cpp alternativeshelper.cpp commontools.cpp globalshortcuts.cpp diff --git a/liblattedock/CMakeLists.txt b/liblatte2/CMakeLists.txt similarity index 61% rename from liblattedock/CMakeLists.txt rename to liblatte2/CMakeLists.txt index 052872591..8e5d192dc 100644 --- a/liblattedock/CMakeLists.txt +++ b/liblatte2/CMakeLists.txt @@ -1,15 +1,15 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-latte-lib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-latte-lib.h) -set(lattedock_SRCS - lattedockplugin.cpp +set(latteplugin_SRCS + latteplugin.cpp quickwindowsystem.cpp - dock.cpp iconitem.cpp + types.cpp ) -add_library(lattedockplugin SHARED ${lattedock_SRCS}) +add_library(latte2plugin SHARED ${latteplugin_SRCS}) -target_link_libraries(lattedockplugin +target_link_libraries(latte2plugin Qt5::Quick Qt5::Qml KF5::CoreAddons @@ -20,10 +20,10 @@ target_link_libraries(lattedockplugin ) if(HAVE_X11) - target_link_libraries(lattedockplugin KF5::WindowSystem) + target_link_libraries(latte2plugin KF5::WindowSystem) endif() -install(TARGETS lattedockplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte) +install(TARGETS latte2plugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte) install(DIRECTORY qml/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/latte) diff --git a/liblattedock/config-latte-lib.h.cmake b/liblatte2/config-latte-lib.h.cmake similarity index 100% rename from liblattedock/config-latte-lib.h.cmake rename to liblatte2/config-latte-lib.h.cmake diff --git a/liblattedock/extras.cpp b/liblatte2/extras.cpp similarity index 100% rename from liblattedock/extras.cpp rename to liblatte2/extras.cpp diff --git a/liblattedock/extras.h b/liblatte2/extras.h similarity index 97% rename from liblattedock/extras.h rename to liblatte2/extras.h index 7b52fe2cf..53756b56c 100644 --- a/liblattedock/extras.h +++ b/liblatte2/extras.h @@ -2,7 +2,7 @@ #define EXTRAS_H // local -#include "../liblattedock/config-latte-lib.h" +#include "../liblatte2/config-latte-lib.h" // C++ #include diff --git a/liblattedock/iconitem.cpp b/liblatte2/iconitem.cpp similarity index 99% rename from liblattedock/iconitem.cpp rename to liblatte2/iconitem.cpp index 178050a47..95a9f2452 100644 --- a/liblattedock/iconitem.cpp +++ b/liblatte2/iconitem.cpp @@ -23,7 +23,7 @@ #include "iconitem.h" // local -#include "../liblattedock/extras.h" +#include "../liblatte2/extras.h" // Qt #include diff --git a/liblattedock/iconitem.h b/liblatte2/iconitem.h similarity index 100% rename from liblattedock/iconitem.h rename to liblatte2/iconitem.h diff --git a/liblattedock/lattedockplugin.cpp b/liblatte2/latteplugin.cpp similarity index 76% rename from liblattedock/lattedockplugin.cpp rename to liblatte2/latteplugin.cpp index 2953bfd93..6921f6fbc 100644 --- a/liblattedock/lattedockplugin.cpp +++ b/liblatte2/latteplugin.cpp @@ -18,20 +18,20 @@ * along with this program. If not, see . */ -#include "lattedockplugin.h" +#include "latteplugin.h" // local -#include "dock.h" #include "iconitem.h" #include "quickwindowsystem.h" +#include "types.h" // Qt #include -void LatteDockPlugin::registerTypes(const char *uri) +void LattePlugin::registerTypes(const char *uri) { Q_ASSERT(uri == QLatin1String("org.kde.latte")); - qmlRegisterUncreatableType(uri, 0, 1, "Dock", "Latte Dock Types uncreatable"); - qmlRegisterType(uri, 0, 1, "IconItem"); - qmlRegisterSingletonType(uri, 0, 1, "WindowSystem", &Latte::windowsystem_qobject_singletontype_provider); + qmlRegisterUncreatableType(uri, 0, 2, "Types", "Latte Types uncreatable"); + qmlRegisterType(uri, 0, 2, "IconItem"); + qmlRegisterSingletonType(uri, 0, 2, "WindowSystem", &Latte::windowsystem_qobject_singletontype_provider); } diff --git a/liblattedock/lattedockplugin.h b/liblatte2/latteplugin.h similarity index 90% rename from liblattedock/lattedockplugin.h rename to liblatte2/latteplugin.h index 554638ca2..878dad258 100644 --- a/liblattedock/lattedockplugin.h +++ b/liblatte2/latteplugin.h @@ -18,13 +18,13 @@ * along with this program. If not, see . */ -#ifndef LATTEDOCKPLUGIN_H -#define LATTEDOCKPLUGIN_H +#ifndef LATTEPLUGIN_H +#define LATTEPLUGIN_H // Qt #include -class LatteDockPlugin : public QQmlExtensionPlugin +class LattePlugin : public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") diff --git a/liblattedock/qml/BadgeText.qml b/liblatte2/qml/BadgeText.qml similarity index 100% rename from liblattedock/qml/BadgeText.qml rename to liblatte2/qml/BadgeText.qml diff --git a/liblattedock/qml/GlowPoint.qml b/liblatte2/qml/GlowPoint.qml similarity index 100% rename from liblattedock/qml/GlowPoint.qml rename to liblatte2/qml/GlowPoint.qml diff --git a/liblatte2/qmldir b/liblatte2/qmldir new file mode 100644 index 000000000..d32d3d880 --- /dev/null +++ b/liblatte2/qmldir @@ -0,0 +1,5 @@ +module org.kde.latte +plugin latte2plugin + +GlowPoint 0.2 GlowPoint.qml +BadgeText 0.2 BadgeText.qml diff --git a/liblattedock/quickwindowsystem.cpp b/liblatte2/quickwindowsystem.cpp similarity index 100% rename from liblattedock/quickwindowsystem.cpp rename to liblatte2/quickwindowsystem.cpp diff --git a/liblattedock/quickwindowsystem.h b/liblatte2/quickwindowsystem.h similarity index 100% rename from liblattedock/quickwindowsystem.h rename to liblatte2/quickwindowsystem.h diff --git a/liblattedock/dock.cpp b/liblatte2/types.cpp similarity index 97% rename from liblattedock/dock.cpp rename to liblatte2/types.cpp index 014c88040..26ba7ce43 100644 --- a/liblattedock/dock.cpp +++ b/liblatte2/types.cpp @@ -18,4 +18,4 @@ * along with this program. If not, see . */ -#include "dock.h" +#include "types.h" diff --git a/liblattedock/dock.h b/liblatte2/types.h similarity index 97% rename from liblattedock/dock.h rename to liblatte2/types.h index 478845148..7a4595543 100644 --- a/liblattedock/dock.h +++ b/liblatte2/types.h @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#ifndef DOCK_H -#define DOCK_H +#ifndef TYPES_H +#define TYPES_H // Qt #include @@ -28,13 +28,13 @@ namespace Latte { -class Dock +class Types { Q_GADGET public: - Dock() = delete; - ~Dock() {} + Types() = delete; + ~Types() {} enum Visibility { diff --git a/liblattedock/qmldir b/liblattedock/qmldir deleted file mode 100644 index cc0e65863..000000000 --- a/liblattedock/qmldir +++ /dev/null @@ -1,5 +0,0 @@ -module org.kde.latte -plugin lattedockplugin - -GlowPoint 0.1 GlowPoint.qml -BadgeText 0.1 BadgeText.qml