Commit 9a98cd21 authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

mv dtkNotification to dtkWidgets layer

parent b55e0838
......@@ -251,7 +251,6 @@ target_link_libraries(${PROJECT_NAME} dtkMeta)
target_link_libraries(${PROJECT_NAME} dtkWidgets)
target_link_libraries(${PROJECT_NAME} dtkDistributed)
target_link_libraries(${PROJECT_NAME} dtkGuiSupport)
target_link_libraries(${PROJECT_NAME} dtkMathSupport)
## #################################################################
......
......@@ -27,7 +27,7 @@
#include <dtkLog/dtkLogger.h>
#include <dtkMathSupport/dtkGraph.h>
#include <dtkGuiSupport/dtkNotification.h>
#include <dtkWidgets/dtkNotification.h>
#include <QtCore>
#include <QtConcurrent>
......
......@@ -17,7 +17,7 @@
#include "dtkComposerTransmitterEmitter.h"
#include "dtkComposerTransmitterReceiver.h"
#include <dtkGuiSupport/dtkNotification.h>
#include <dtkWidgets/dtkNotification.h>
#include <dtkLog>
#include <dtkMeta>
......
......@@ -47,7 +47,7 @@
#include "dtkComposerTransmitterProxyLoop.h"
#include <dtkGuiSupport/dtkToolBox.h>
#include <dtkWidgets/dtkToolBox.h>
// /////////////////////////////////////////////////////////////////
// dtkComposerSceneNodeEditorList
......
......@@ -15,11 +15,6 @@ set(${PROJECT_NAME}_HEADERS
dtkColorGrid.h
dtkFlowLayout.h
dtkFinder.h
dtkNotifiable.h
dtkNotification.h
dtkNotificationDisplay.h
dtkNotificationEvent.h
dtkNotificationQueue.h
dtkObjectEditor.h
dtkPieChart.h
dtkPluginsEditor.h
......@@ -53,10 +48,6 @@ set(${PROJECT_NAME}_SOURCES
dtkFlowLayout.cpp
dtkFinder.cpp
dtkObjectEditor.cpp
dtkNotification.cpp
dtkNotificationDisplay.cpp
dtkNotificationEvent.cpp
dtkNotificationQueue.cpp
dtkPieChart.cpp
dtkPluginsEditor.cpp
dtkPopup.cpp
......@@ -91,8 +82,7 @@ set(${PROJECT_NAME}_SOURCES
endif(APPLE)
set(${PROJECT_NAME}_SOURCES_RCC
dtkGui.qrc
dtkNotification.qrc)
dtkGui.qrc)
## #################################################################
## Build rules
......
......@@ -20,6 +20,11 @@ project(dtkWidgets)
set(${PROJECT_NAME}_HEADERS
dtkApplication.h
dtkNotifiable.h
dtkNotification.h
dtkNotificationDisplay.h
dtkNotificationEvent.h
dtkNotificationQueue.h
dtkPropertyEditor.h
dtkPropertyEditorFactory.h
dtkToolBox.h
......@@ -37,6 +42,10 @@ set(${PROJECT_NAME}_HEADERS
dtkWidgetsTagCloudView.h)
set(${PROJECT_NAME}_SOURCES
dtkNotification.cpp
dtkNotificationDisplay.cpp
dtkNotificationEvent.cpp
dtkNotificationQueue.cpp
dtkPropertyEditor.cpp
dtkPropertyEditorFactory.cpp
dtkToolBox.cpp
......@@ -53,6 +62,7 @@ set(${PROJECT_NAME}_SOURCES
dtkWidgetsTagCloudView.cpp)
set(${PROJECT_NAME}_SOURCES_RCC
dtkNotification.qrc
dtkWidgetsTagCloud.qrc)
## #################################################################
......
......@@ -20,11 +20,11 @@
#ifndef DTKNOTIFIABLE_H
#define DTKNOTIFIABLE_H
#include "dtkGuiSupportExport.h"
#include "dtkWidgetsExport.h"
#include <QtCore>
class DTKGUISUPPORT_EXPORT dtkNotifiable
class DTKWIDGETS_EXPORT dtkNotifiable
{
public:
virtual void clear(void) = 0;
......
......@@ -20,7 +20,7 @@
#ifndef DTKNOTIFICATION_H
#define DTKNOTIFICATION_H
#include "dtkGuiSupportExport.h"
#include "dtkWidgetsExport.h"
#include "dtkNotificationEvent.h"
// /////////////////////////////////////////////////////////////////
......@@ -33,9 +33,9 @@ static const int dtkNotificationEventType = QEvent::User + 1003;
// Helper functions
// /////////////////////////////////////////////////////////////////
DTKGUISUPPORT_EXPORT void dtkNotify(const QString& message);
DTKGUISUPPORT_EXPORT void dtkNotify(const QString& message, int duration);
DTKGUISUPPORT_EXPORT void dtkNotify(dtkNotificationEvent *event);
DTKGUISUPPORT_EXPORT void dtkClearNotifications(void);
DTKWIDGETS_EXPORT void dtkNotify(const QString& message);
DTKWIDGETS_EXPORT void dtkNotify(const QString& message, int duration);
DTKWIDGETS_EXPORT void dtkNotify(dtkNotificationEvent *event);
DTKWIDGETS_EXPORT void dtkClearNotifications(void);
#endif
......@@ -21,13 +21,13 @@
#define DTKNOTIFICATIONDISPLAY_H
#include "dtkNotifiable.h"
#include "dtkGuiSupportExport.h"
#include "dtkWidgetsExport.h"
#include <QtWidgets>
class dtkNotificationDisplayPrivate;
class DTKGUISUPPORT_EXPORT dtkNotificationDisplay : public QFrame, public dtkNotifiable
class DTKWIDGETS_EXPORT dtkNotificationDisplay : public QFrame, public dtkNotifiable
{
Q_OBJECT
......
......@@ -20,13 +20,13 @@
#ifndef DTKNOTIFICATIONEVENT_H
#define DTKNOTIFICATIONEVENT_H
#include "dtkGuiSupportExport.h"
#include "dtkWidgetsExport.h"
#include <QtCore>
class dtkNotificationEventPrivate;
class DTKGUISUPPORT_EXPORT dtkNotificationEvent : public QEvent
class DTKWIDGETS_EXPORT dtkNotificationEvent : public QEvent
{
public:
enum Type {
......
......@@ -20,7 +20,7 @@
#ifndef DTKNOTIFICATIONQUEUE_H
#define DTKNOTIFICATIONQUEUE_H
#include "dtkGuiSupportExport.h"
#include "dtkWidgetsExport.h"
#include <QtCore>
......@@ -28,7 +28,7 @@ class dtkNotifiable;
class dtkNotificationEvent;
class dtkNotificationQueuePrivate;
class DTKGUISUPPORT_EXPORT dtkNotificationQueue : public QObject
class DTKWIDGETS_EXPORT dtkNotificationQueue : public QObject
{
Q_OBJECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment