#include "pv/logging.hpp"
#include "pv/mainwindow.hpp"
#include "pv/session.hpp"
+#include "pv/util.hpp"
#ifdef ANDROID
#include <libsigrokandroidutils/libsigrokandroidutils.h>
" -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"
{"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'},
for (int i = 0; i < argc; i++)
open_files.emplace_back(argv[i]);
+ qRegisterMetaType<pv::util::Timestamp>("util::Timestamp");
+ qRegisterMetaType<uint64_t>("uint64_t");
+
// Prepare the global settings since logging needs them early on
pv::GlobalSettings settings;
+ settings.save_internal_defaults();
settings.set_defaults_where_needed();
+ settings.apply_theme();
pv::logging.init();
if (open_files.empty())
w.add_default_session();
else
- for (string open_file : open_files)
+ for (string& open_file : open_files)
w.add_session_with_file(open_file, open_file_format);
#ifdef ENABLE_SIGNALS