From 6c03efaed9056953b4ec8ffa11f1c8d47138f483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20BERTHO?= Date: Tue, 1 May 2018 16:30:56 +0200 Subject: [PATCH] Add dialog if no file in cli MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: RĂ©mi BERTHO --- SimplePanoramaViewer | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/SimplePanoramaViewer b/SimplePanoramaViewer index 42accae..1df0628 100755 --- a/SimplePanoramaViewer +++ b/SimplePanoramaViewer @@ -3,6 +3,7 @@ import os import sys from os import path +from pathlib import Path from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5.QtCore import * from PyQt5.QtGui import * @@ -10,7 +11,17 @@ from PyQt5.QtWidgets import * from PyQt5.QtWebEngine import * from PyQt5.QtWebEngineWidgets import * -img = path.abspath(sys.argv[1]) +app = QApplication(sys.argv) +app.setApplicationName("SimplePanoramaViewer") + +if len(sys.argv) < 2: + img_dialog = QFileDialog.getOpenFileName(None, "Open image", str(Path.home()), "JPG Images (*.jpg *.JPG *.jpeg)") + img = img_dialog[0] +else: + img = path.abspath(sys.argv[1]) + +if img == "": + exit(0) exe_dir = path.dirname(path.realpath(sys.argv[0])) os.chdir(exe_dir) @@ -22,9 +33,6 @@ except OSError as exception: print("Error: HTML file not found: " + str(exception)) html = html.replace("__IMG_PATH__", img) -app = QApplication(sys.argv) -app.setApplicationName("SimplePanoramaViewer") - web = QWebEngineView() web.setHtml(html,QUrl("file://" + exe_dir + "/index.html")) web.setWindowTitle(img)