summaryrefslogtreecommitdiff
path: root/test/uitests
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2020-12-29 16:09:43 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2020-12-29 16:39:54 +0100
commit645250e1cd8ce9bc1faea599df7a1b05836bfeb8 (patch)
treec6311afab3900d2dd2aecbfbe1ac348d0e48c428 /test/uitests
parentdce64999d3325c5b55499d6ba657066efa48fbff (diff)
Split UI code into application/plugin UI and UI library.
Diffstat (limited to 'test/uitests')
-rw-r--r--test/uitests/Makefile.am31
-rw-r--r--test/uitests/benchmarktest.cc6
-rw-r--r--test/uitests/filebrowsertest.cc7
-rw-r--r--test/uitests/framewidgettest.cc15
-rw-r--r--test/uitests/powerwidgettest.cc17
-rw-r--r--test/uitests/resizetest.cc7
-rw-r--r--test/uitests/tabwidgettest.cc13
7 files changed, 55 insertions, 41 deletions
diff --git a/test/uitests/Makefile.am b/test/uitests/Makefile.am
index 8b1877e..a27a44b 100644
--- a/test/uitests/Makefile.am
+++ b/test/uitests/Makefile.am
@@ -2,11 +2,12 @@ noinst_PROGRAMS = resizetest tabwidgettest framewidgettest \
filebrowsertest benchmarktest powerwidgettest
resizetest_LDADD = \
- $(top_builddir)/plugingui/libdggui.la \
+ $(top_builddir)/dggui/libdggui.la \
+ $(top_builddir)/plugingui/libplugingui.la \
$(top_builddir)/src/libdg.la \
$(top_builddir)/src/libnls.la
resizetest_CXXFLAGS = \
- -I$(top_srcdir)/plugingui \
+ -I$(top_srcdir)/ \
-I$(top_srcdir)/src \
-I$(top_srcdir)/hugin
resizetest_SOURCES = \
@@ -14,11 +15,12 @@ resizetest_SOURCES = \
$(top_srcdir)/hugin/hugin.c
tabwidgettest_LDADD = \
- $(top_builddir)/plugingui/libdggui.la \
+ $(top_builddir)/dggui/libdggui.la \
+ $(top_builddir)/plugingui/libplugingui.la \
$(top_builddir)/src/libdg.la \
$(top_builddir)/src/libnls.la
tabwidgettest_CXXFLAGS = \
- -I$(top_srcdir)/plugingui \
+ -I$(top_srcdir)/ \
-I$(top_srcdir)/src \
-I$(top_srcdir)/hugin
tabwidgettest_SOURCES = \
@@ -26,11 +28,13 @@ tabwidgettest_SOURCES = \
$(top_srcdir)/hugin/hugin.c
filebrowsertest_LDADD = \
- $(top_builddir)/plugingui/libdggui.la \
+ $(top_builddir)/dggui/libdggui.la \
+ $(top_builddir)/plugingui/libplugingui.la \
$(top_builddir)/src/libdg.la \
$(top_builddir)/src/libnls.la
filebrowsertest_CXXFLAGS = \
-I$(top_srcdir)/plugingui \
+ -I$(top_srcdir)/ \
-I$(top_srcdir)/src \
-I$(top_srcdir)/hugin
filebrowsertest_SOURCES = \
@@ -38,11 +42,12 @@ filebrowsertest_SOURCES = \
$(top_srcdir)/hugin/hugin.c
framewidgettest_LDADD = \
- $(top_builddir)/plugingui/libdggui.la \
+ $(top_builddir)/dggui/libdggui.la \
+ $(top_builddir)/plugingui/libplugingui.la \
$(top_builddir)/src/libdg.la \
$(top_builddir)/src/libnls.la
framewidgettest_CXXFLAGS = \
- -I$(top_srcdir)/plugingui \
+ -I$(top_srcdir)/ \
-I$(top_srcdir)/src \
-I$(top_srcdir)/hugin
framewidgettest_SOURCES = \
@@ -59,15 +64,15 @@ rcgen_verbose = $(rcgen_verbose_@AM_V@)
rcgen_verbose_ = $(rcgen_verbose_@AM_DEFAULT_V@)
rcgen_verbose_0 = @echo " RCGEN "$@;
-benchmarktest_resource_data.cc: $(top_builddir)/plugingui/rcgen $(RES)
- $(rcgen_verbose)$(top_builddir)/plugingui/rcgen$(EXEEXT) -d $(top_srcdir)/test/uitests -o $@ $(RES)
+benchmarktest_resource_data.cc: $(top_builddir)/dggui/rcgen $(RES)
+ $(rcgen_verbose)$(top_builddir)/dggui/rcgen$(EXEEXT) -d $(top_srcdir)/test/uitests -o $@ $(RES)
benchmarktest_LDADD = \
- $(top_builddir)/plugingui/libdggui.la \
+ $(top_builddir)/dggui/libdggui.la \
$(top_builddir)/src/libdg.la \
$(top_builddir)/src/libnls.la
benchmarktest_CXXFLAGS = \
- -I$(top_srcdir)/plugingui \
+ -I$(top_srcdir)/ \
-I$(top_srcdir)/src \
-I$(top_srcdir)/hugin
nodist_benchmarktest_SOURCES = \
@@ -81,11 +86,13 @@ CLEANFILES = benchmarktest_resource_data.cc
powerwidgettest_LDADD = \
- $(top_builddir)/plugingui/libdggui.la \
+ $(top_builddir)/dggui/libdggui.la \
+ $(top_builddir)/plugingui/libplugingui.la \
$(top_builddir)/src/libdg.la \
$(top_builddir)/src/libnls.la
powerwidgettest_CXXFLAGS = \
-I$(top_srcdir)/plugingui \
+ -I$(top_srcdir)/ \
-I$(top_srcdir)/src \
-I$(top_srcdir)/hugin
powerwidgettest_SOURCES = \
diff --git a/test/uitests/benchmarktest.cc b/test/uitests/benchmarktest.cc
index aaf3946..5566942 100644
--- a/test/uitests/benchmarktest.cc
+++ b/test/uitests/benchmarktest.cc
@@ -29,9 +29,9 @@
#include <cstdint>
#include <string>
-#include <image.h>
-#include <painter.h>
-#include <canvas.h>
+#include <dggui/image.h>
+#include <dggui/painter.h>
+#include <dggui/canvas.h>
class TimedCanvas
: public GUI::Canvas
diff --git a/test/uitests/filebrowsertest.cc b/test/uitests/filebrowsertest.cc
index 5f78921..7c309d9 100644
--- a/test/uitests/filebrowsertest.cc
+++ b/test/uitests/filebrowsertest.cc
@@ -29,9 +29,10 @@
#include <thread>
#include <hugin.hpp>
-#include <window.h>
-#include <button.h>
-#include <label.h>
+
+#include <dggui/window.h>
+#include <dggui/button.h>
+#include <dggui/label.h>
#include <filebrowser.h>
class TestWindow
diff --git a/test/uitests/framewidgettest.cc b/test/uitests/framewidgettest.cc
index a2a24db..4f0e0fd 100644
--- a/test/uitests/framewidgettest.cc
+++ b/test/uitests/framewidgettest.cc
@@ -28,14 +28,15 @@
#include <chrono>
#include <thread>
-#include <button.h>
-#include <checkbox.h>
-#include <frame.h>
#include <hugin.hpp>
-#include <label.h>
-#include <layout.h>
-#include <window.h>
-#include <painter.h>
+
+#include <dggui/button.h>
+#include <dggui/checkbox.h>
+#include <dggui/frame.h>
+#include <dggui/label.h>
+#include <dggui/layout.h>
+#include <dggui/window.h>
+#include <dggui/painter.h>
// TODO: fix segfault on close
diff --git a/test/uitests/powerwidgettest.cc b/test/uitests/powerwidgettest.cc
index 9ab0458..41aff67 100644
--- a/test/uitests/powerwidgettest.cc
+++ b/test/uitests/powerwidgettest.cc
@@ -28,15 +28,18 @@
#include <chrono>
#include <thread>
-#include <button.h>
-#include <checkbox.h>
-#include <frame.h>
#include <hugin.hpp>
-#include <label.h>
-#include <layout.h>
-#include <window.h>
-#include <painter.h>
+
+#include <dggui/button.h>
+#include <dggui/checkbox.h>
+#include <dggui/frame.h>
+#include <dggui/label.h>
+#include <dggui/layout.h>
+#include <dggui/window.h>
+#include <dggui/painter.h>
+
#include <settings.h>
+
#include <powerwidget.h>
class TestWindow
diff --git a/test/uitests/resizetest.cc b/test/uitests/resizetest.cc
index 8facc61..28439d1 100644
--- a/test/uitests/resizetest.cc
+++ b/test/uitests/resizetest.cc
@@ -29,9 +29,10 @@
#include <thread>
#include <hugin.hpp>
-#include <window.h>
-#include <font.h>
-#include <painter.h>
+
+#include <dggui/window.h>
+#include <dggui/font.h>
+#include <dggui/painter.h>
class TestWindow
: public GUI::Window
diff --git a/test/uitests/tabwidgettest.cc b/test/uitests/tabwidgettest.cc
index 722dc02..36a69cc 100644
--- a/test/uitests/tabwidgettest.cc
+++ b/test/uitests/tabwidgettest.cc
@@ -29,12 +29,13 @@
#include <thread>
#include <hugin.hpp>
-#include <window.h>
-#include <tabwidget.h>
-#include <label.h>
-#include <layout.h>
-#include <button.h>
-#include <painter.h>
+
+#include <dggui/window.h>
+#include <dggui/tabwidget.h>
+#include <dggui/label.h>
+#include <dggui/layout.h>
+#include <dggui/button.h>
+#include <dggui/painter.h>
class Widget1
: public GUI::Widget