diff --git a/configuration.ini b/configuration.ini index f5d6b1c..dcfad23 100644 --- a/configuration.ini +++ b/configuration.ini @@ -1,6 +1,6 @@ [user] +default-recipe = epub.zip font-size = 12 -default-recipe = doc.zip -font-name = Carlito +font-name = Arial default-book-name = dokument2 diff --git a/main.py b/main.py index 4b900d5..463aa62 100755 --- a/main.py +++ b/main.py @@ -1,9 +1,9 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- + import os import sys -import logging -import configparser +import util import settings import main_dialog import table_widget @@ -13,8 +13,9 @@ from PyQt5 import QtWidgets from PyQt5.QtWidgets import QMainWindow, QApplication -settings.crateFolderAboutName("temp") -settings.crateFolderAboutName("outputs") +util.createDir("temp") +util.createDir("outputs") + settings.prepareGlobalVariables() print("settings zipsFolder:", settings.zipsFolder) diff --git a/main_dialog.py b/main_dialog.py index 20afed6..5fdbfb4 100644 --- a/main_dialog.py +++ b/main_dialog.py @@ -76,9 +76,9 @@ from ui import mainwindow_ui from ui.mainwindow_ui import Ui_MainWindow -settings.sets = configparser.ConfigParser() +# settings.sets = configparser.ConfigParser() settings.sets = settings.loadConfiguration() -fixNameOfFile = QRegExp("(([\w\d])+([ ]||[-]||[_]))*") +fixNameOfFile = QRegExp("([\w\d])^+([ ]|[-]|[_])") class MainWindow(QMainWindow, Ui_MainWindow): @@ -146,7 +146,7 @@ def __init__(self, app): settings.zipsFolder self.returnedFiles = [] - self.boxIsChecked = False + self.boxChecked = False self.selectedRecipe = str(settings.localPath + settings.zipsFolder + settings.sets['user']['default-recipe']) self.items_changed() @@ -268,11 +268,11 @@ def load_files(self): self.items_changed() # << END of: Load files on >> # - def return_boxIsChecked(self): - self.isChecked = self.check_box_1.checkState() - return self.isChecked + def isBoxChecked(self): + self.boxState = self.check_box_1.checkState() + return self.boxState - def return_files(self): + def get_files(self): self.returnedFiles = [] for x in range(self.list_widget_1.count()): self.returnedFiles.append(self.list_widget_1.item(x).showPath()) @@ -284,7 +284,7 @@ def select_recipe(self): recipeDialog = None recipeDialog = RecipeDialog(recipeDialog, self.selectedRecipe) recipeDialog.exec_() - self.selectedRecipe = recipeDialog.retRecipe() + self.selectedRecipe = recipeDialog.getRecipe() self.items_changed() print(self.selectedRecipe) # for debugging @@ -295,8 +295,8 @@ def select_recipe(self): def conf_variables(self): bookName = str(self.line_edit_1.text()) variablesDialog = VariablesDialog(self.selectedRecipe, - self.return_files(), - self.return_boxIsChecked(), + self.get_files(), + self.isBoxChecked(), bookName) variablesDialog.exec_() self.shellCommand() diff --git a/recipe_dialog.py b/recipe_dialog.py index e320770..bb4090f 100644 --- a/recipe_dialog.py +++ b/recipe_dialog.py @@ -43,6 +43,7 @@ settings.loadConfiguration() + class RecipeDialog(QtWidgets.QDialog, recipe_ui.Ui_Dialog): def __init__(self, app, selectedRecipe): super(RecipeDialog, self).__init__() @@ -74,8 +75,8 @@ def accept(self): def reject(self): super(RecipeDialog, self).reject() - def retRecipe(self): - return (self.loadedRecipe) + def getRecipe(self): + return self.loadedRecipe def setRecipe(self): self.ui.combo_box_1.setCurrentText(str(self.loadedRecipe)) diff --git a/settings.py b/settings.py index 3c713e5..f263f93 100644 --- a/settings.py +++ b/settings.py @@ -5,11 +5,9 @@ import PyQt5 from PyQt5 import QtGui -from PyQt5 import QtWidgets from PyQt5.QtGui import QFont -from PyQt5.QtWidgets import QLabel """ Settings with global variables """ @@ -26,26 +24,18 @@ font = "" -def isFolderExist(name): - isFolderExist = (os.path.isdir(name)) - return isFolderExist +def getValue(form_field): + value = form_field + print("GET defalut Value: ", value) + return value -def crateFolderAboutName(name): - try: - os.mkdir(name) - except FileExistsError as error: - print("Directory \"" + name + "\" exist") - return True - print("Create \"" + name + "\" directory") - - -def getDefaultRecipe(): - defaultRecipe = settings_dialog.settings_ui.combo_box_1.currentText() +def getDefaultRecipe(form_field): # settings_dialog.settings_ui.combo_box_1.currentText() + defaultRecipe = form_field print(defaultRecipe) return defaultRecipe - +""" def getDefaultFontName(): return defaultFontName @@ -56,13 +46,19 @@ def getDefaultFontSize(): def getDefaultOutputName(): return defaultOutputName + """ - +""" def buildConfiguration(): confWriter = configparser.ConfigParser() + recipe = str(getValue(settings_dialog.settings_ui.combo_box_1.currentText())) + size = int(getValue(settings_dialog.settings_ui.spin_box_1.currentText())) - recipe = getDefaultRecipe() - size = getDefaultFontSize() + recipe = str(getValue(settings_dialog.settings_ui.combo_box_1.currentText())) + size = int(getValue(settings_dialog.settings_ui.spin_box_1.value())) + font = size = int(getValue(settings_dialog.settings_ui.spin_box_1.currentText())) + + size = getDefaultValue() font = getDefaultFontName() outputName = getDefaultOutputName() confWriter['user'] = { @@ -72,7 +68,7 @@ def buildConfiguration(): 'default-book-name': outputName } return confWriter - +""" def saveConfiguration(defaultRecipe, fontName, fontSize, bookName): config = configparser.ConfigParser() @@ -87,17 +83,13 @@ def saveConfiguration(defaultRecipe, fontName, fontSize, bookName): def loadConfiguration(configfile='configuration.ini'): confReader = configparser.ConfigParser() confReader.read(configfile) - global sets - sets = confReader return confReader def prepareGlobalVariables(): global localPath localPath = os.path.dirname(__file__) - global sets - sets = configparser.ConfigParser() sets = loadConfiguration() global pathsOfDocuments pathsOfDocuments = [] @@ -112,7 +104,6 @@ def prepareGlobalVariables(): + sets['user']['default-recipe']) global defaultRecipe defaultRecipe = str(sets['user']['default-recipe']) - global font font = QFont(sets['user']['font-name'], int(sets['user']['font-size'])) diff --git a/settings_dialog.py b/settings_dialog.py index e0eb07c..e5059ba 100644 --- a/settings_dialog.py +++ b/settings_dialog.py @@ -94,8 +94,8 @@ def accept(self): if information == QMessageBox.Ok: print('inforamtion - QMessageBox say Ok') # for debugging - defaultRecipe = str(settings.localPath + settings.zipsFolder + - self.combo_box_1.currentText()) + settings.defaultRecipe = str(settings.localPath + settings.zipsFolder + + self.combo_box_1.currentText()) self.setFont(QFont(settings.sets['user']['font-name'], int(settings.sets['user']['font-size']))) diff --git a/util.py b/util.py new file mode 100644 index 0000000..f6cc432 --- /dev/null +++ b/util.py @@ -0,0 +1,14 @@ +import os + +def dirExists(name): + isFolderExist = (os.path.isdir(name)) + return isFolderExist + + +def createDir(name): + try: + os.mkdir(name) + except FileExistsError as error: + print("Directory \"" + name + "\" exist") + return True + print("Create \"" + name + "\" directory") \ No newline at end of file diff --git a/zips/kolokwium.7z b/zips/kolokwium.7z new file mode 100644 index 0000000..ba3c286 Binary files /dev/null and b/zips/kolokwium.7z differ