X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=f4325bf7dcfdb16928a53a1fc62559e3e3342fda;hp=9d35376bbfcd2d9dff1773e306d51bfd0d105ce1;hb=db1aabc15dc8680673b943c2dd0f38a83c32a1d9;hpb=09f55d9665efb3b17ba7de4bae47be6989e884fe

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d35376b..f4325bf7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,6 +210,7 @@ set(pulseview_SOURCES
 	main.cpp
 	pv/application.cpp
 	pv/devicemanager.cpp
+	pv/globalsettings.cpp
 	pv/mainwindow.cpp
 	pv/session.cpp
 	pv/storesession.cpp
@@ -229,9 +230,9 @@ set(pulseview_SOURCES
 	pv/devices/hardwaredevice.cpp
 	pv/devices/inputfile.cpp
 	pv/devices/sessionfile.cpp
-	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
 	pv/dialogs/inputoutputoptions.cpp
+	pv/dialogs/settings.cpp
 	pv/dialogs/storeprogress.cpp
 	pv/popups/deviceoptions.cpp
 	pv/popups/channels.cpp
@@ -283,14 +284,19 @@ set(pulseview_SOURCES
 
 # This list includes only QObject derived class headers.
 set(pulseview_HEADERS
+	pv/globalsettings.hpp
 	pv/mainwindow.hpp
 	pv/session.hpp
 	pv/storesession.hpp
 	pv/binding/device.hpp
+	pv/data/analog.hpp
+	pv/data/analogsegment.hpp
+	pv/data/logic.hpp
+	pv/data/logicsegment.hpp
 	pv/data/signalbase.hpp
-	pv/dialogs/about.hpp
 	pv/dialogs/connect.hpp
 	pv/dialogs/inputoutputoptions.hpp
+	pv/dialogs/settings.hpp
 	pv/dialogs/storeprogress.hpp
 	pv/popups/channels.hpp
 	pv/popups/deviceoptions.hpp
@@ -335,10 +341,6 @@ set(pulseview_HEADERS
 	pv/widgets/wellarray.hpp
 )
 
-set(pulseview_FORMS
-	pv/dialogs/about.ui
-)
-
 set(pulseview_RESOURCES
 	pulseview.qrc
 )
@@ -385,14 +387,12 @@ endif()
 
 if(Qt5Core_FOUND)
 	qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
-	qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 	qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 else()
 	# Workaround for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
 	# https://bugreports.qt.io/browse/QTBUG-22829
 	qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}
 		OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
-	qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 	qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 	include(${QT_USE_FILE})
 endif()
@@ -476,14 +476,12 @@ if(ANDROID)
 add_library(${PROJECT_NAME} SHARED
 	${pulseview_SOURCES}
 	${pulseview_HEADERS_MOC}
-	${pulseview_FORMS_HEADERS}
 	${pulseview_RESOURCES_RCC}
 )
 else()
 add_executable(${PROJECT_NAME}
 	${pulseview_SOURCES}
 	${pulseview_HEADERS_MOC}
-	${pulseview_FORMS_HEADERS}
 	${pulseview_RESOURCES_RCC}
 )
 endif()