X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=e5472c2a0b14e9eacf32d380223019dd007947a7;hp=daec62d2af09055409677d90885bc9faac5ce4af;hb=e5cc818627748b95b6a6d14cc4cf509ab4669fa8;hpb=dddff2e7c658aa84f67186ade0a4845b5fb0b43f

diff --git a/main.cpp b/main.cpp
index daec62d2..e5472c2a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,20 +14,20 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #endif
 
-#include <stdint.h>
+#include <cstdint>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <getopt.h>
 
 #include <QDebug>
+#include <QSettings>
 
 #ifdef ENABLE_SIGNALS
 #include "signalhandler.hpp"
@@ -45,16 +45,20 @@
 #include "config.h"
 
 #ifdef _WIN32
-// The static qsvg lib is required for SVG graphics/icons (on Windows).
 #include <QtPlugin>
-Q_IMPORT_PLUGIN(qsvg)
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+Q_IMPORT_PLUGIN(QSvgPlugin)
 #endif
 
+using std::exception;
+using std::shared_ptr;
+using std::string;
+
 void usage()
 {
 	fprintf(stdout,
 		"Usage:\n"
-		"  %s [OPTION…] — %s\n"
+		"  %s [OPTIONS] [FILE]\n"
 		"\n"
 		"Help Options:\n"
 		"  -h, -?, --help                  Show help option\n"
@@ -64,14 +68,16 @@ void usage()
 		"  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
 		"  -i, --input-file                Load input from file\n"
 		"  -I, --input-format              Input format\n"
-		"\n", PV_BIN_NAME, PV_DESCRIPTION);
+		"  -c, --clean                     Don't restore previous sessions on startup\n"
+		"\n", PV_BIN_NAME);
 }
 
 int main(int argc, char *argv[])
 {
 	int ret = 0;
-	std::shared_ptr<sigrok::Context> context;
-	std::string open_file, open_file_format;
+	shared_ptr<sigrok::Context> context;
+	string open_file, open_file_format;
+	bool restore_sessions = true;
 
 	Application a(argc, argv);
 
@@ -82,18 +88,19 @@ int main(int argc, char *argv[])
 #endif
 
 	// Parse arguments
-	while (1) {
+	while (true) {
 		static const struct option long_options[] = {
-			{"help", no_argument, 0, 'h'},
-			{"version", no_argument, 0, 'V'},
-			{"loglevel", required_argument, 0, 'l'},
-			{"input-file", required_argument, 0, 'i'},
-			{"input-format", required_argument, 0, 'I'},
-			{0, 0, 0, 0}
+			{"help", no_argument, nullptr, 'h'},
+			{"version", no_argument, nullptr, 'V'},
+			{"loglevel", required_argument, nullptr, 'l'},
+			{"input-file", required_argument, nullptr, 'i'},
+			{"input-format", required_argument, nullptr, 'I'},
+			{"clean", no_argument, nullptr, 'c'},
+			{nullptr, 0, nullptr, 0}
 		};
 
 		const int c = getopt_long(argc, argv,
-			"l:Vh?i:I:", long_options, nullptr);
+			"l:Vhc?i:I:", long_options, nullptr);
 		if (c == -1)
 			break;
 
@@ -117,6 +124,11 @@ int main(int argc, char *argv[])
 			srd_log_loglevel_set(loglevel);
 #endif
 
+			if (loglevel >= 5) {
+				const QSettings settings;
+				qDebug() << "Settings:" << settings.fileName()
+					<< "format" << settings.format();
+			}
 			break;
 		}
 
@@ -127,16 +139,21 @@ int main(int argc, char *argv[])
 		case 'I':
 			open_file_format = optarg;
 			break;
+
+		case 'c':
+			restore_sessions = false;
+			break;
 		}
 	}
 
 	if (argc - optind > 1) {
-		fprintf(stderr, "Only one file can be openened.\n");
+		fprintf(stderr, "Only one file can be opened.\n");
 		return 1;
-	} else if (argc - optind == 1) {
-		open_file = argv[argc - 1];
 	}
 
+	if (argc - optind == 1)
+		open_file = argv[argc - 1];
+
 	// Initialise libsigrok
 	context = sigrok::Context::create();
 #ifdef ANDROID
@@ -160,8 +177,8 @@ int main(int argc, char *argv[])
 			pv::DeviceManager device_manager(context);
 
 			// Initialise the main window
-			pv::MainWindow w(device_manager,
-				open_file, open_file_format);
+			pv::MainWindow w(device_manager, open_file, open_file_format,
+				restore_sessions);
 			w.show();
 
 #ifdef ENABLE_SIGNALS
@@ -183,7 +200,7 @@ int main(int argc, char *argv[])
 			// Run the application
 			ret = a.exec();
 
-		} catch(std::exception e) {
+		} catch (exception e) {
 			qDebug() << e.what();
 		}
 
@@ -192,7 +209,7 @@ int main(int argc, char *argv[])
 		srd_exit();
 #endif
 
-	} while (0);
+	} while (false);
 
 	return ret;
 }