X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=b24b9711c963542799066c653ba2d6b68057fc92;hp=469cb5e22fb7c24598a15e6d8de4b6f80386bdcf;hb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2;hpb=0c0e1888d11fd2135e439f82993b56b2323703ec

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 469cb5e..b24b971 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,15 +107,17 @@ 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/annotation.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
@@ -129,7 +131,7 @@ set(pulseview_SOURCES
 	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,10 +140,15 @@ 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/decodergroupbox.cpp
+	pv/widgets/decodermenu.cpp
 	pv/widgets/popup.cpp
+	pv/widgets/popuptoolbutton.cpp
 	pv/widgets/wellarray.cpp
 )
 
@@ -149,13 +156,20 @@ set(pulseview_SOURCES
 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/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
@@ -166,6 +180,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/decodergroupbox.h
+	pv/widgets/decodermenu.h
+	pv/widgets/popup.h
+	pv/widgets/popuptoolbutton.h
 	pv/widgets/wellarray.h
 )