diff --git a/.gitignore b/.gitignore index 83f3b0a..29729f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ venv/ +target/ +src/ .vscode *~ \ No newline at end of file diff --git a/README.md b/README.md index 02455de..55bdb0f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # comics2pdf -Python3 script and GUI that converts comic files (cbr, cbz) to pdf (on Linux) +Python3 script and GUI that converts comic files (cbr, cbz) to pdf (on Linux/Mac)
diff --git a/comic2pdf.py b/comics2pdf.py similarity index 100% rename from comic2pdf.py rename to comics2pdf.py diff --git a/comics2pdf_gui.py b/comics2pdf_gui.py index 9d19ca0..d67c1f0 100755 --- a/comics2pdf_gui.py +++ b/comics2pdf_gui.py @@ -44,16 +44,14 @@ def initUI(self): def openFileNameDialog(self): options = QtWidgets.QFileDialog.Options() fileName, _ = QtWidgets.QFileDialog.getOpenFileName( - self, "QFileDialog.getOpenFileName()", "", "CBR and CBZ files (*.cbr, *.cbz)", options=options) + self, "Find File", "", "CBR and CBZ files (*.cbr, *.cbz)", options=options) if fileName: - print(fileName) self.path = fileName def openDirectoryNameDialog(self): options = QtWidgets.QFileDialog.Options() fileName = QtWidgets.QFileDialog.getExistingDirectory(self, options=options) if fileName: - print(fileName) self.path = fileName @@ -68,12 +66,9 @@ def __init__(self): self.done = 0 def on_button_clicked(self): - if self.file.isChecked(): - explorer = Explorer(True) - else: - explorer = Explorer(False) - - self.path = explorer.path + explorer = Explorer(self.file.isChecked()) + if (explorer.path): + self.path = explorer.path self.pathTo.setText(self.path) def setupUi(self, Form):