X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=51ba86ef31583d28470e4296cbf3b0b45f4e9649;hp=4d1e9190119bc60bb0d0b4eb0a69062165e45cdd;hb=ce94e4fd5d7ab666259231d21759613f1f2b93ee;hpb=e0fc58100fbcd6c3bfd5aecb213d7541a3436622

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d1e9190..51ba86ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,21 +114,22 @@ set(pulseview_SOURCES
 	pv/data/snapshot.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
-	pv/dialogs/decoder.cpp
-	pv/dialogs/deviceoptions.cpp
+	pv/popups/deviceoptions.cpp
+	pv/popups/probes.cpp
 	pv/prop/bool.cpp
 	pv/prop/double.cpp
 	pv/prop/enum.cpp
 	pv/prop/int.cpp
 	pv/prop/property.cpp
+	pv/prop/string.cpp
 	pv/prop/binding/binding.cpp
+	pv/prop/binding/decoderoptions.cpp
 	pv/prop/binding/deviceoptions.cpp
-	pv/toolbars/contextbar.cpp
 	pv/toolbars/samplingbar.cpp
 	pv/view/analogsignal.cpp
 	pv/view/cursor.cpp
 	pv/view/cursorpair.cpp
-	pv/view/decodesignal.cpp
+	pv/view/decodetrace.cpp
 	pv/view/header.cpp
 	pv/view/marginwidget.cpp
 	pv/view/logicsignal.cpp
@@ -137,9 +138,16 @@ set(pulseview_SOURCES
 	pv/view/signal.cpp
 	pv/view/timemarker.cpp
 	pv/view/trace.cpp
+	pv/view/tracepalette.cpp
 	pv/view/view.cpp
 	pv/view/viewport.cpp
 	pv/view/decode/annotation.cpp
+	pv/widgets/colourbutton.cpp
+	pv/widgets/colourpopup.cpp
+	pv/widgets/decodermenu.cpp
+	pv/widgets/popup.cpp
+	pv/widgets/popuptoolbutton.cpp
+	pv/widgets/wellarray.cpp
 )
 
 # This list includes only QObject derrived class headers
@@ -149,11 +157,17 @@ set(pulseview_HEADERS
 	pv/data/decoder.h
 	pv/dialogs/about.h
 	pv/dialogs/connect.h
-	pv/dialogs/deviceoptions.h
-	pv/toolbars/contextbar.h
+	pv/popups/deviceoptions.h
+	pv/popups/probes.h
+	pv/prop/bool.h
+	pv/prop/double.h
+	pv/prop/enum.h
+	pv/prop/int.h
+	pv/prop/property.h
+	pv/prop/string.h
 	pv/toolbars/samplingbar.h
 	pv/view/cursor.h
-	pv/view/decodesignal.h
+	pv/view/decodetrace.h
 	pv/view/header.h
 	pv/view/logicsignal.h
 	pv/view/marginwidget.h
@@ -164,6 +178,11 @@ set(pulseview_HEADERS
 	pv/view/trace.h
 	pv/view/view.h
 	pv/view/viewport.h
+	pv/widgets/colourbutton.h
+	pv/widgets/colourpopup.h
+	pv/widgets/decodermenu.h
+	pv/widgets/popuptoolbutton.h
+	pv/widgets/wellarray.h
 )
 
 set(pulseview_FORMS