diff --git a/ImportPhotos.py b/ImportPhotos.py index 6979924..b78cfe8 100644 --- a/ImportPhotos.py +++ b/ImportPhotos.py @@ -199,6 +199,7 @@ def initGui(self): self.dlg = ImportPhotosDialog() #self.dlg.setWindowFlags(Qt.CustomizeWindowHint | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint) + self.dlg.load_style_path.setPlaceholderText( "e.g." + os.path.join(self.plugin_dir, "photos.qml")) self.dlg.ok.clicked.connect(self.ok) self.dlg.closebutton.clicked.connect(self.close) self.dlg.toolButtonImport.clicked.connect(self.toolButtonImport) @@ -361,7 +362,7 @@ def ok(self): self.directoryPhotos = self.dlg.imp.text() if self.dlg.input_load_style.text() == '': - self.load_style = os.path.join(self.plugin_dir, "svg", "photos.qml") + self.load_style = os.path.join(self.plugin_dir, "photos.qml") else: self.load_style = self.dlg.load_style_path.text() @@ -378,7 +379,7 @@ def ok(self): def import_photos(self, directoryPhotos, outputPath, load_style, showMessageHide=True): if load_style == '': - self.load_style = os.path.join(self.plugin_dir, "svg", "photos.qml") + self.load_style = os.path.join(self.plugin_dir, "photos.qml") else: self.load_style = load_style self.showMessageHide = showMessageHide diff --git a/impphotos.ui b/impphotos.ui index 549d332..e79e320 100644 --- a/impphotos.ui +++ b/impphotos.ui @@ -9,7 +9,7 @@ 0 0 - 382 + 430 223 @@ -19,12 +19,6 @@ 223 - - - 382 - 223 - - ImportPhotos @@ -34,242 +28,257 @@ false - - - - 10 - 20 - 361 - 141 - - - - - - - Input folder location - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Browse... - - - - - - - Output file location - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Browse... - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - - - - Load style (optional) - - - - - - - - 0 - 0 - - - - Browse... - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - - - - - - - 190 - 180 - 181 - 25 - - - - - - - - 0 - 0 - - - - OK - - - - - - - - 0 - 0 - - - - Close - - - - - + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Browse... + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + e.g. + + + + + + + + 0 + 0 + + + + Browse... + + + + + + + Output file location + + + + + + + + 0 + 0 + + + + Browse... + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + + + + Load style (optional) + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 40 + 20 + + + + + + + + Input folder location + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + OK + + + + + + + + + + 0 + 0 + + + + Close + + + + + + diff --git a/svg/photos.qml b/photos.qml similarity index 100% rename from svg/photos.qml rename to photos.qml