X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=5072c4521be4fdf80f0b7458614263335e7bf90f;hp=f633cd5505562c585bfca86c683cdafd1b85a49e;hb=0bce86095e332bedff9643e3dfbe409259e2df5f;hpb=21ad818feabcb0a1cb51c61c534adce553c7e325

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f633cd55..5072c452 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-##
+
 ## This file is part of the PulseView project.
 ##
 ## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -107,29 +107,30 @@ set(pulseview_SOURCES
 	pv/sigsession.cpp
 	pv/data/analog.cpp
 	pv/data/analogsnapshot.cpp
-	pv/data/decoder.cpp
+	pv/data/decoderstack.cpp
 	pv/data/logic.cpp
 	pv/data/logicsnapshot.cpp
 	pv/data/signaldata.cpp
 	pv/data/snapshot.cpp
+	pv/data/decode/decoder.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
@@ -138,23 +139,36 @@ 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
 set(pulseview_HEADERS
 	pv/mainwindow.h
 	pv/sigsession.h
-	pv/data/decoder.h
+	pv/data/decoderstack.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
@@ -165,6 +179,12 @@ 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/popup.h
+	pv/widgets/popuptoolbutton.h
+	pv/widgets/wellarray.h
 )
 
 set(pulseview_FORMS