X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=4bd6388e1051fd506d99ae24f19fa5d43704346f;hp=dc3f739f25cdac5451502ca2e3462cf7acc93df6;hb=79b53a1ae4a451ef60c18dff9957d311ab90c396;hpb=1f2082e20445966624f6172ebefd53fb1a021164

diff --git a/main.cpp b/main.cpp
index dc3f739f..4bd6388e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -36,6 +36,8 @@
 #include <QSettings>
 #include <QTextStream>
 
+#include "config.h"
+
 #ifdef ENABLE_SIGNALS
 #include "signalhandler.hpp"
 #endif
@@ -59,8 +61,6 @@
 #include "android/loghandler.hpp"
 #endif
 
-#include "config.h"
-
 #ifdef _WIN32
 #include <QtPlugin>
 Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
@@ -151,7 +151,7 @@ void usage()
 		"  -V, --version                   Show release version\n"
 		"  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
 		"  -d, --driver                    Specify the device driver to use\n"
-		"  -D, --no-scan                   Don't auto-scan for devices, use -d spec only\n"
+		"  -D, --dont-scan                 Don't auto-scan for devices, use -d spec only\n"
 		"  -i, --input-file                Load input from file\n"
 		"  -I, --input-format              Input format\n"
 		"  -c, --clean                     Don't restore previous sessions on startup\n"
@@ -166,6 +166,7 @@ int main(int argc, char *argv[])
 	vector<string> open_files;
 	bool restore_sessions = true;
 	bool do_scan = true;
+	bool show_version = false;
 
 	Application a(argc, argv);
 
@@ -182,7 +183,7 @@ int main(int argc, char *argv[])
 			{"version", no_argument, nullptr, 'V'},
 			{"loglevel", required_argument, nullptr, 'l'},
 			{"driver", required_argument, nullptr, 'd'},
-			{"no-scan", no_argument, nullptr, 'D'},
+			{"dont-scan", no_argument, nullptr, 'D'},
 			{"input-file", required_argument, nullptr, 'i'},
 			{"input-format", required_argument, nullptr, 'I'},
 			{"clean", no_argument, nullptr, 'c'},
@@ -202,9 +203,8 @@ int main(int argc, char *argv[])
 			return 0;
 
 		case 'V':
-			// Print version info
-			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
-			return 0;
+			show_version = true;
+			break;
 
 		case 'l':
 		{
@@ -256,7 +256,9 @@ int main(int argc, char *argv[])
 
 	// Prepare the global settings since logging needs them early on
 	pv::GlobalSettings settings;
+	settings.save_default_palette();
 	settings.set_defaults_where_needed();
+	settings.apply_theme();
 
 	pv::logging.init();
 
@@ -300,32 +302,37 @@ int main(int argc, char *argv[])
 		// Create the device manager, initialise the drivers
 		pv::DeviceManager device_manager(context, driver, do_scan);
 
-		// Initialise the main window
-		pv::MainWindow w(device_manager);
-		w.show();
+		a.collect_version_info(context);
+		if (show_version) {
+			a.print_version_info();
+		} else {
+			// Initialise the main window
+			pv::MainWindow w(device_manager);
+			w.show();
 
-		if (restore_sessions)
-			w.restore_sessions();
+			if (restore_sessions)
+				w.restore_sessions();
 
-		if (open_files.empty())
-			w.add_default_session();
-		else
-			for (string open_file : open_files)
-				w.add_session_with_file(open_file, open_file_format);
+			if (open_files.empty())
+				w.add_default_session();
+			else
+				for (string open_file : open_files)
+					w.add_session_with_file(open_file, open_file_format);
 
 #ifdef ENABLE_SIGNALS
-		if (SignalHandler::prepare_signals()) {
-			SignalHandler *const handler = new SignalHandler(&w);
-			QObject::connect(handler, SIGNAL(int_received()),
-				&w, SLOT(close()));
-			QObject::connect(handler, SIGNAL(term_received()),
-				&w, SLOT(close()));
-		} else
-			qWarning() << "Could not prepare signal handler.";
+			if (SignalHandler::prepare_signals()) {
+				SignalHandler *const handler = new SignalHandler(&w);
+				QObject::connect(handler, SIGNAL(int_received()),
+					&w, SLOT(close()));
+				QObject::connect(handler, SIGNAL(term_received()),
+					&w, SLOT(close()));
+			} else
+				qWarning() << "Could not prepare signal handler.";
 #endif
 
-		// Run the application
-		ret = a.exec();
+			// Run the application
+			ret = a.exec();
+		}
 
 #ifndef ENABLE_STACKTRACE
 		} catch (exception& e) {