From bc3bf5a0d41e5ae7b4808f00375f0156ad2c4e8d Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Mon, 7 Mar 2022 19:05:23 +0100 Subject: [PATCH 01/11] Clarified max bottle number --- src/display_controller.py | 10 ++++++---- src/ui/setup_bottle_window.py | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/display_controller.py b/src/display_controller.py index a1d633bd..369ea851 100644 --- a/src/display_controller.py +++ b/src/display_controller.py @@ -7,6 +7,8 @@ from src.models import Cocktail, Ingredient from src.config_manager import shared +MAX_SUPPORTED_BOTTLES = 10 + class DisplayController(DialogHandler): """ Controler Class to get Values from the UI""" @@ -462,8 +464,8 @@ def get_labels_maker_ingredients(self, w): def __choose_bottle_number(self, get_all): """Selects the number of Bottles in the bottles tab, all is ten""" if get_all: - return 10 - return min(self.MAKER_NUMBER_BOTTLES, 10) + return MAX_SUPPORTED_BOTTLES + return min(self.MAKER_NUMBER_BOTTLES, MAX_SUPPORTED_BOTTLES) def get_numberlabel_bottles(self, w, get_all=False): """Returns all label object for the number of the bottle""" @@ -472,10 +474,10 @@ def get_numberlabel_bottles(self, w, get_all=False): def adjust_bottle_number_displayed(self, w): """Removes the UI elements if not all ten bottles are used per config""" - used_bottles = min(self.MAKER_NUMBER_BOTTLES, 10) + used_bottles = min(self.MAKER_NUMBER_BOTTLES, MAX_SUPPORTED_BOTTLES) # This needs to be done to get rid of registered bottles in the then removed bottles all_bottles = DB_COMMANDER.get_ingredients_at_bottles() - DB_COMMANDER.set_bottleorder(all_bottles[:used_bottles] + [""] * (10 - used_bottles)) + DB_COMMANDER.set_bottleorder(all_bottles[:used_bottles] + [""] * (MAX_SUPPORTED_BOTTLES - used_bottles)) comboboxes_bottles = self.get_comboboxes_bottles(w, True) self.set_multiple_combobox_to_top_item(comboboxes_bottles[used_bottles::]) to_adjust = [ diff --git a/src/ui/setup_bottle_window.py b/src/ui/setup_bottle_window.py index ef97c89e..bfdd3c3c 100644 --- a/src/ui/setup_bottle_window.py +++ b/src/ui/setup_bottle_window.py @@ -1,7 +1,7 @@ from PyQt5.QtWidgets import QMainWindow +from PyQt5.QtCore import Qt from src.ui_elements.bottlewindow import Ui_Bottlewindow -from PyQt5.QtCore import Qt from src.config_manager import ConfigManager from src.bottles import set_fill_level_bars @@ -9,6 +9,8 @@ from src.dialog_handler import UI_LANGUAGE from src.display_controller import DP_CONTROLLER +MAX_SUPPORTED_BOTTLES = 10 + class BottleWindow(QMainWindow, Ui_Bottlewindow, ConfigManager): """ Creates the Window to change to levels of the bottles. """ @@ -54,7 +56,7 @@ def __init__(self, parent=None): def __choose_bottle_number(self): """Selects the number of Bottles in the bottles tab, all is ten""" - return min(self.MAKER_NUMBER_BOTTLES, 10) + return min(self.MAKER_NUMBER_BOTTLES, MAX_SUPPORTED_BOTTLES) def abbrechen_clicked(self): """ Closes the Window without a change. """ From 61287a6cd7c2db49c468737b49d1cdd25c7045ce Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Mon, 7 Mar 2022 19:44:02 +0100 Subject: [PATCH 02/11] Fixed tuple --- src/database_commander.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/database_commander.py b/src/database_commander.py index ba2c8152..9115fba6 100644 --- a/src/database_commander.py +++ b/src/database_commander.py @@ -442,7 +442,7 @@ def create_tables(self): # Creating the Space Naming of the Bottles for bottle_count in range(1, 13): - self.cursor.execute("INSERT INTO Bottles(Bottle) VALUES (?)", (bottle_count)) + self.cursor.execute("INSERT INTO Bottles(Bottle) VALUES (?)", (bottle_count,)) self.database.commit() self.database.close() From 079efa02db0c99fa317ed72b2554f7f96417155c Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Mon, 7 Mar 2022 19:44:29 +0100 Subject: [PATCH 03/11] Migration to 16 supported bottles --- src/display_controller.py | 2 +- src/migrator.py | 10 ++++++++++ src/ui/setup_bottle_window.py | 10 +++++----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/display_controller.py b/src/display_controller.py index 369ea851..44f08cda 100644 --- a/src/display_controller.py +++ b/src/display_controller.py @@ -7,7 +7,7 @@ from src.models import Cocktail, Ingredient from src.config_manager import shared -MAX_SUPPORTED_BOTTLES = 10 +MAX_SUPPORTED_BOTTLES = 16 class DisplayController(DialogHandler): diff --git a/src/migrator.py b/src/migrator.py index 79875091..551714e0 100644 --- a/src/migrator.py +++ b/src/migrator.py @@ -57,6 +57,9 @@ def make_migrations(self): logger.log_event("INFO", "Making migrations for v1.6.0") self.__change_git_repo() self.__install_pip_package("pyfiglet", "1.6.0") + if self.older_than_version("1.6.1"): + logger.log_event("INFO", "Making migrations for v1.6.1") + self.__add_more_bottles_to_db() self.__check_local_version_data() def __check_local_version_data(self): @@ -105,6 +108,13 @@ def __rename_database_to_english(self): except OperationalError: pass + def __add_more_bottles_to_db(self): + """Updates the bottles to support up to 16 bottles""" + logger.log_event("INFO", "Adding bottle numbers 11 to 16 to DB") + db_handler = DatabaseHandler() + for bottle_count in range(11, 17): + db_handler.query_database("INSERT OR IGNORE INTO Bottles(Bottle) VALUES (?)", (bottle_count,)) + def __add_team_buffer_to_database(self): """Adds an additional table for buffering not send team data""" logger.log_event("INFO", "Adding team buffer table to database") diff --git a/src/ui/setup_bottle_window.py b/src/ui/setup_bottle_window.py index bfdd3c3c..7d438486 100644 --- a/src/ui/setup_bottle_window.py +++ b/src/ui/setup_bottle_window.py @@ -9,7 +9,7 @@ from src.dialog_handler import UI_LANGUAGE from src.display_controller import DP_CONTROLLER -MAX_SUPPORTED_BOTTLES = 10 +MAX_SUPPORTED_BOTTLES = 16 class BottleWindow(QMainWindow, Ui_Bottlewindow, ConfigManager): @@ -33,10 +33,10 @@ def __init__(self, parent=None): self.asign_bottle_data() # creates lists of the objects and assings functions later through a loop number = self.__choose_bottle_number() - myplus = [getattr(self, f"PBMplus{x}") for x in range(1, 11)] - myminus = [getattr(self, f"PBMminus{x}") for x in range(1, 11)] - mylabel = [getattr(self, f"LAmount{x}") for x in range(1, 11)] - myname = [getattr(self, f"LName{x}") for x in range(1, 11)] + myplus = [getattr(self, f"PBMplus{x}") for x in range(1, MAX_SUPPORTED_BOTTLES + 1)] + myminus = [getattr(self, f"PBMminus{x}") for x in range(1, MAX_SUPPORTED_BOTTLES + 1)] + mylabel = [getattr(self, f"LAmount{x}") for x in range(1, MAX_SUPPORTED_BOTTLES + 1)] + myname = [getattr(self, f"LName{x}") for x in range(1, MAX_SUPPORTED_BOTTLES + 1)] # since zip only goes to the minimal of all, only one [:number] is needed for plus, minus, field, vol in zip(myplus, myminus, mylabel[:number], self.maxvolume): From a2f9b6a07c59d395bb8c2b53cd77e11335868eca Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Mon, 7 Mar 2022 19:48:21 +0100 Subject: [PATCH 04/11] Adjusted bottle count to 16 Please use numbers greater than 10 on display height larger than 480 px --- readme.md | 2 +- src/ui_elements/Cocktailmanager_2.py | 822 +++++++++---- src/ui_elements/Cocktailmanager_2.ui | 1644 +++++++++++++++++++------- src/ui_elements/bottlewindow.py | 864 +++++++++----- src/ui_elements/bottlewindow.ui | 1150 ++++++++++++++---- 5 files changed, 3288 insertions(+), 1194 deletions(-) diff --git a/readme.md b/readme.md index dc582d43..4f1432c3 100644 --- a/readme.md +++ b/readme.md @@ -239,7 +239,7 @@ These values are stored under the `custom_config.yaml` file. This file will be c | `UI_HEIGHT` | _int_ | Desired interface height, default is 480 | ❌ | | `PUMP_PINS` | _list[int]_ | List of the RPi-Pins where each Pump is connected | ❌ | | `PUMP_VOLUMEFLOW` | _list[int]_ | List of the according volume flow for each pump in ml/s | ❌ | -| `MAKER_NUMBER_BOTTLES` | _int_ | Number of displayed bottles. Can use up to ten bottles | ❌ | +| `MAKER_NUMBER_BOTTLES` | _int_ | Number of displayed bottles. Can use up to 16 bottles | ❌ | | `MAKER_SEARCH_UPDATES` | _bool_ | Boolean flag to search for updates at program start | ❌ | | `MAKER_CLEAN_TIME` | _int_ | Time the machine will execute the cleaning program | ❌ | | `MAKER_SLEEP_TIME` | _float_ | Interval between each UI refresh while generating a cocktail | ❌ | diff --git a/src/ui_elements/Cocktailmanager_2.py b/src/ui_elements/Cocktailmanager_2.py index a5686bc9..1e9c8b6c 100644 --- a/src/ui_elements/Cocktailmanager_2.py +++ b/src/ui_elements/Cocktailmanager_2.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file '.\Cocktailmanager_2.ui' # -# Created by: PyQt5 UI code generator 5.15.4 +# Created by: PyQt5 UI code generator 5.15.6 # # WARNING: Any manual changes made to this file will be lost when pyuic5 is # run again. Do not edit this file unless you know what you are doing. @@ -14,13 +14,13 @@ class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(800, 485) + MainWindow.resize(800, 700) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth()) MainWindow.setSizePolicy(sizePolicy) - MainWindow.setMaximumSize(QtCore.QSize(800, 485)) + MainWindow.setMaximumSize(QtCore.QSize(800, 700)) MainWindow.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) MainWindow.setAutoFillBackground(False) MainWindow.setStyleSheet("QCheckBox::indicator{\n" @@ -1138,114 +1138,16 @@ def setupUi(self, MainWindow): self.horizontalLayout_12.setObjectName("horizontalLayout_12") self.gridLayout_2 = QtWidgets.QGridLayout() self.gridLayout_2.setObjectName("gridLayout_2") - self.LBelegung8 = QtWidgets.QLabel(self.tab_4) - self.LBelegung8.setMinimumSize(QtCore.QSize(120, 29)) - self.LBelegung8.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(12) - self.LBelegung8.setFont(font) - self.LBelegung8.setStyleSheet(" color: rgb(239, 151, 0);") - self.LBelegung8.setObjectName("LBelegung8") - self.gridLayout_2.addWidget(self.LBelegung8, 7, 1, 1, 1) - self.LBelegung7 = QtWidgets.QLabel(self.tab_4) - self.LBelegung7.setMinimumSize(QtCore.QSize(120, 29)) - self.LBelegung7.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(12) - self.LBelegung7.setFont(font) - self.LBelegung7.setStyleSheet(" color: rgb(239, 151, 0);") - self.LBelegung7.setObjectName("LBelegung7") - self.gridLayout_2.addWidget(self.LBelegung7, 6, 1, 1, 1) - self.LBelegung9 = QtWidgets.QLabel(self.tab_4) - self.LBelegung9.setMinimumSize(QtCore.QSize(120, 29)) - self.LBelegung9.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(12) - self.LBelegung9.setFont(font) - self.LBelegung9.setStyleSheet(" color: rgb(239, 151, 0);") - self.LBelegung9.setObjectName("LBelegung9") - self.gridLayout_2.addWidget(self.LBelegung9, 8, 1, 1, 1) - self.PBneu2 = QtWidgets.QPushButton(self.tab_4) - self.PBneu2.setMinimumSize(QtCore.QSize(50, 29)) - self.PBneu2.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(14) - font.setBold(True) - font.setWeight(75) - self.PBneu2.setFont(font) - self.PBneu2.setCheckable(True) - self.PBneu2.setObjectName("PBneu2") - self.gridLayout_2.addWidget(self.PBneu2, 1, 0, 1, 1) - self.PBneu5 = QtWidgets.QPushButton(self.tab_4) - self.PBneu5.setMinimumSize(QtCore.QSize(50, 29)) - self.PBneu5.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(14) - font.setBold(True) - font.setWeight(75) - self.PBneu5.setFont(font) - self.PBneu5.setCheckable(True) - self.PBneu5.setObjectName("PBneu5") - self.gridLayout_2.addWidget(self.PBneu5, 4, 0, 1, 1) - self.PBneu6 = QtWidgets.QPushButton(self.tab_4) - self.PBneu6.setMinimumSize(QtCore.QSize(50, 29)) - self.PBneu6.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(14) - font.setBold(True) - font.setWeight(75) - self.PBneu6.setFont(font) - self.PBneu6.setCheckable(True) - self.PBneu6.setObjectName("PBneu6") - self.gridLayout_2.addWidget(self.PBneu6, 5, 0, 1, 1) - self.PBneu7 = QtWidgets.QPushButton(self.tab_4) - self.PBneu7.setMinimumSize(QtCore.QSize(50, 29)) - self.PBneu7.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(14) - font.setBold(True) - font.setWeight(75) - self.PBneu7.setFont(font) - self.PBneu7.setCheckable(True) - self.PBneu7.setObjectName("PBneu7") - self.gridLayout_2.addWidget(self.PBneu7, 6, 0, 1, 1) - self.PBneu9 = QtWidgets.QPushButton(self.tab_4) - self.PBneu9.setMinimumSize(QtCore.QSize(50, 29)) - self.PBneu9.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(14) - font.setBold(True) - font.setWeight(75) - self.PBneu9.setFont(font) - self.PBneu9.setCheckable(True) - self.PBneu9.setObjectName("PBneu9") - self.gridLayout_2.addWidget(self.PBneu9, 8, 0, 1, 1) - self.PBFlanwenden = QtWidgets.QPushButton(self.tab_4) - self.PBFlanwenden.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(16) - font.setBold(True) - font.setWeight(75) - self.PBFlanwenden.setFont(font) - self.PBFlanwenden.setObjectName("PBFlanwenden") - self.gridLayout_2.addWidget(self.PBFlanwenden, 11, 0, 1, 3) - self.LECleanMachine = ClickableLineEdit(self.tab_4) - self.LECleanMachine.setMinimumSize(QtCore.QSize(0, 29)) - self.LECleanMachine.setMaximumSize(QtCore.QSize(50, 100)) - self.LECleanMachine.setEchoMode(QtWidgets.QLineEdit.Password) - self.LECleanMachine.setObjectName("LECleanMachine") - self.gridLayout_2.addWidget(self.LECleanMachine, 11, 4, 1, 1) - self.PBneu10 = QtWidgets.QPushButton(self.tab_4) - self.PBneu10.setMinimumSize(QtCore.QSize(50, 29)) - self.PBneu10.setMaximumSize(QtCore.QSize(16777215, 100)) + self.CBB1 = QtWidgets.QComboBox(self.tab_4) + self.CBB1.setMinimumSize(QtCore.QSize(103, 29)) + self.CBB1.setMaximumSize(QtCore.QSize(300, 100)) font = QtGui.QFont() font.setPointSize(14) - font.setBold(True) - font.setWeight(75) - self.PBneu10.setFont(font) - self.PBneu10.setCheckable(True) - self.PBneu10.setObjectName("PBneu10") - self.gridLayout_2.addWidget(self.PBneu10, 9, 0, 1, 1) + self.CBB1.setFont(font) + self.CBB1.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) + self.CBB1.setMaxVisibleItems(11) + self.CBB1.setObjectName("CBB1") + self.gridLayout_2.addWidget(self.CBB1, 0, 4, 1, 2) self.PBneu8 = QtWidgets.QPushButton(self.tab_4) self.PBneu8.setMinimumSize(QtCore.QSize(50, 29)) self.PBneu8.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1321,7 +1223,16 @@ def setupUi(self, MainWindow): font.setWeight(75) self.PBBelegung.setFont(font) self.PBBelegung.setObjectName("PBBelegung") - self.gridLayout_2.addWidget(self.PBBelegung, 11, 3, 1, 1) + self.gridLayout_2.addWidget(self.PBBelegung, 17, 4, 1, 1) + self.PBCleanMachine = QtWidgets.QPushButton(self.tab_4) + self.PBCleanMachine.setMaximumSize(QtCore.QSize(200, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBCleanMachine.setFont(font) + self.PBCleanMachine.setObjectName("PBCleanMachine") + self.gridLayout_2.addWidget(self.PBCleanMachine, 17, 6, 1, 1) self.PBneu4 = QtWidgets.QPushButton(self.tab_4) self.PBneu4.setMinimumSize(QtCore.QSize(50, 29)) self.PBneu4.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1333,15 +1244,6 @@ def setupUi(self, MainWindow): self.PBneu4.setCheckable(True) self.PBneu4.setObjectName("PBneu4") self.gridLayout_2.addWidget(self.PBneu4, 3, 0, 1, 1) - self.PBCleanMachine = QtWidgets.QPushButton(self.tab_4) - self.PBCleanMachine.setMaximumSize(QtCore.QSize(200, 100)) - font = QtGui.QFont() - font.setPointSize(14) - font.setBold(True) - font.setWeight(75) - self.PBCleanMachine.setFont(font) - self.PBCleanMachine.setObjectName("PBCleanMachine") - self.gridLayout_2.addWidget(self.PBCleanMachine, 11, 5, 1, 1) self.bottleLabel1 = QtWidgets.QLabel(self.tab_4) self.bottleLabel1.setMinimumSize(QtCore.QSize(0, 29)) self.bottleLabel1.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1353,38 +1255,115 @@ def setupUi(self, MainWindow): self.bottleLabel1.setStyleSheet(" color: rgb(239, 151, 0);") self.bottleLabel1.setAlignment(QtCore.Qt.AlignCenter) self.bottleLabel1.setObjectName("bottleLabel1") - self.gridLayout_2.addWidget(self.bottleLabel1, 0, 5, 1, 1) - self.CBB1 = QtWidgets.QComboBox(self.tab_4) - self.CBB1.setMinimumSize(QtCore.QSize(103, 29)) - self.CBB1.setMaximumSize(QtCore.QSize(300, 100)) + self.gridLayout_2.addWidget(self.bottleLabel1, 0, 6, 1, 1) + self.PBneu10 = QtWidgets.QPushButton(self.tab_4) + self.PBneu10.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu10.setMaximumSize(QtCore.QSize(16777215, 100)) font = QtGui.QFont() font.setPointSize(14) - self.CBB1.setFont(font) - self.CBB1.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) - self.CBB1.setMaxVisibleItems(11) - self.CBB1.setObjectName("CBB1") - self.gridLayout_2.addWidget(self.CBB1, 0, 3, 1, 2) - self.PBneu1 = QtWidgets.QPushButton(self.tab_4) - self.PBneu1.setMinimumSize(QtCore.QSize(50, 29)) - self.PBneu1.setMaximumSize(QtCore.QSize(16777215, 100)) + font.setBold(True) + font.setWeight(75) + self.PBneu10.setFont(font) + self.PBneu10.setCheckable(True) + self.PBneu10.setObjectName("PBneu10") + self.gridLayout_2.addWidget(self.PBneu10, 9, 0, 1, 1) + self.PBneu5 = QtWidgets.QPushButton(self.tab_4) + self.PBneu5.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu5.setMaximumSize(QtCore.QSize(16777215, 100)) font = QtGui.QFont() font.setPointSize(14) font.setBold(True) font.setWeight(75) - self.PBneu1.setFont(font) - self.PBneu1.setCheckable(True) - self.PBneu1.setChecked(False) - self.PBneu1.setObjectName("PBneu1") - self.gridLayout_2.addWidget(self.PBneu1, 0, 0, 1, 1) - self.LBelegung1 = QtWidgets.QLabel(self.tab_4) - self.LBelegung1.setMinimumSize(QtCore.QSize(120, 29)) - self.LBelegung1.setMaximumSize(QtCore.QSize(16777215, 100)) + self.PBneu5.setFont(font) + self.PBneu5.setCheckable(True) + self.PBneu5.setObjectName("PBneu5") + self.gridLayout_2.addWidget(self.PBneu5, 4, 0, 1, 1) + self.LBelegung9 = QtWidgets.QLabel(self.tab_4) + self.LBelegung9.setMinimumSize(QtCore.QSize(120, 29)) + self.LBelegung9.setMaximumSize(QtCore.QSize(16777215, 100)) font = QtGui.QFont() font.setPointSize(12) - self.LBelegung1.setFont(font) - self.LBelegung1.setStyleSheet(" color: rgb(239, 151, 0);") - self.LBelegung1.setObjectName("LBelegung1") - self.gridLayout_2.addWidget(self.LBelegung1, 0, 1, 1, 1) + self.LBelegung9.setFont(font) + self.LBelegung9.setStyleSheet(" color: rgb(239, 151, 0);") + self.LBelegung9.setObjectName("LBelegung9") + self.gridLayout_2.addWidget(self.LBelegung9, 8, 1, 1, 1) + self.PBneu2 = QtWidgets.QPushButton(self.tab_4) + self.PBneu2.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu2.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu2.setFont(font) + self.PBneu2.setCheckable(True) + self.PBneu2.setObjectName("PBneu2") + self.gridLayout_2.addWidget(self.PBneu2, 1, 0, 1, 1) + self.PBneu9 = QtWidgets.QPushButton(self.tab_4) + self.PBneu9.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu9.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu9.setFont(font) + self.PBneu9.setCheckable(True) + self.PBneu9.setObjectName("PBneu9") + self.gridLayout_2.addWidget(self.PBneu9, 8, 0, 1, 1) + self.PBFlanwenden = QtWidgets.QPushButton(self.tab_4) + self.PBFlanwenden.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(16) + font.setBold(True) + font.setWeight(75) + self.PBFlanwenden.setFont(font) + self.PBFlanwenden.setObjectName("PBFlanwenden") + self.gridLayout_2.addWidget(self.PBFlanwenden, 17, 0, 1, 4) + self.PBneu7 = QtWidgets.QPushButton(self.tab_4) + self.PBneu7.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu7.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu7.setFont(font) + self.PBneu7.setCheckable(True) + self.PBneu7.setObjectName("PBneu7") + self.gridLayout_2.addWidget(self.PBneu7, 6, 0, 1, 1) + self.PBneu6 = QtWidgets.QPushButton(self.tab_4) + self.PBneu6.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu6.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu6.setFont(font) + self.PBneu6.setCheckable(True) + self.PBneu6.setObjectName("PBneu6") + self.gridLayout_2.addWidget(self.PBneu6, 5, 0, 1, 1) + self.LECleanMachine = ClickableLineEdit(self.tab_4) + self.LECleanMachine.setMinimumSize(QtCore.QSize(0, 29)) + self.LECleanMachine.setMaximumSize(QtCore.QSize(50, 100)) + self.LECleanMachine.setEchoMode(QtWidgets.QLineEdit.Password) + self.LECleanMachine.setObjectName("LECleanMachine") + self.gridLayout_2.addWidget(self.LECleanMachine, 17, 5, 1, 1) + self.LBelegung7 = QtWidgets.QLabel(self.tab_4) + self.LBelegung7.setMinimumSize(QtCore.QSize(120, 29)) + self.LBelegung7.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(12) + self.LBelegung7.setFont(font) + self.LBelegung7.setStyleSheet(" color: rgb(239, 151, 0);") + self.LBelegung7.setObjectName("LBelegung7") + self.gridLayout_2.addWidget(self.LBelegung7, 6, 1, 1, 1) + self.LBelegung8 = QtWidgets.QLabel(self.tab_4) + self.LBelegung8.setMinimumSize(QtCore.QSize(120, 29)) + self.LBelegung8.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(12) + self.LBelegung8.setFont(font) + self.LBelegung8.setStyleSheet(" color: rgb(239, 151, 0);") + self.LBelegung8.setObjectName("LBelegung8") + self.gridLayout_2.addWidget(self.LBelegung8, 7, 1, 1, 1) self.ProBBelegung1 = QtWidgets.QProgressBar(self.tab_4) self.ProBBelegung1.setMinimumSize(QtCore.QSize(250, 29)) self.ProBBelegung1.setMaximumSize(QtCore.QSize(1000, 100)) @@ -1396,7 +1375,28 @@ def setupUi(self, MainWindow): self.ProBBelegung1.setProperty("value", 88) self.ProBBelegung1.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.ProBBelegung1.setObjectName("ProBBelegung1") - self.gridLayout_2.addWidget(self.ProBBelegung1, 0, 2, 1, 1) + self.gridLayout_2.addWidget(self.ProBBelegung1, 0, 3, 1, 1) + self.LBelegung1 = QtWidgets.QLabel(self.tab_4) + self.LBelegung1.setMinimumSize(QtCore.QSize(120, 29)) + self.LBelegung1.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(12) + self.LBelegung1.setFont(font) + self.LBelegung1.setStyleSheet(" color: rgb(239, 151, 0);") + self.LBelegung1.setObjectName("LBelegung1") + self.gridLayout_2.addWidget(self.LBelegung1, 0, 1, 1, 1) + self.PBneu1 = QtWidgets.QPushButton(self.tab_4) + self.PBneu1.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu1.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu1.setFont(font) + self.PBneu1.setCheckable(True) + self.PBneu1.setChecked(False) + self.PBneu1.setObjectName("PBneu1") + self.gridLayout_2.addWidget(self.PBneu1, 0, 0, 1, 1) self.LBelegung10 = QtWidgets.QLabel(self.tab_4) self.LBelegung10.setMinimumSize(QtCore.QSize(120, 29)) self.LBelegung10.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1406,18 +1406,6 @@ def setupUi(self, MainWindow): self.LBelegung10.setStyleSheet(" color: rgb(239, 151, 0);") self.LBelegung10.setObjectName("LBelegung10") self.gridLayout_2.addWidget(self.LBelegung10, 9, 1, 1, 1) - self.ProBBelegung2 = QtWidgets.QProgressBar(self.tab_4) - self.ProBBelegung2.setMinimumSize(QtCore.QSize(250, 29)) - self.ProBBelegung2.setMaximumSize(QtCore.QSize(1000, 100)) - font = QtGui.QFont() - font.setPointSize(14) - font.setBold(True) - font.setWeight(75) - self.ProBBelegung2.setFont(font) - self.ProBBelegung2.setProperty("value", 50) - self.ProBBelegung2.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) - self.ProBBelegung2.setObjectName("ProBBelegung2") - self.gridLayout_2.addWidget(self.ProBBelegung2, 1, 2, 1, 1) self.ProBBelegung3 = QtWidgets.QProgressBar(self.tab_4) self.ProBBelegung3.setMinimumSize(QtCore.QSize(250, 29)) self.ProBBelegung3.setMaximumSize(QtCore.QSize(1000, 100)) @@ -1429,19 +1417,7 @@ def setupUi(self, MainWindow): self.ProBBelegung3.setProperty("value", 70) self.ProBBelegung3.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.ProBBelegung3.setObjectName("ProBBelegung3") - self.gridLayout_2.addWidget(self.ProBBelegung3, 2, 2, 1, 1) - self.ProBBelegung6 = QtWidgets.QProgressBar(self.tab_4) - self.ProBBelegung6.setMinimumSize(QtCore.QSize(250, 29)) - self.ProBBelegung6.setMaximumSize(QtCore.QSize(1000, 100)) - font = QtGui.QFont() - font.setPointSize(14) - font.setBold(True) - font.setWeight(75) - self.ProBBelegung6.setFont(font) - self.ProBBelegung6.setProperty("value", 90) - self.ProBBelegung6.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) - self.ProBBelegung6.setObjectName("ProBBelegung6") - self.gridLayout_2.addWidget(self.ProBBelegung6, 5, 2, 1, 1) + self.gridLayout_2.addWidget(self.ProBBelegung3, 2, 3, 1, 1) self.ProBBelegung7 = QtWidgets.QProgressBar(self.tab_4) self.ProBBelegung7.setMinimumSize(QtCore.QSize(250, 29)) self.ProBBelegung7.setMaximumSize(QtCore.QSize(1000, 100)) @@ -1453,19 +1429,31 @@ def setupUi(self, MainWindow): self.ProBBelegung7.setProperty("value", 67) self.ProBBelegung7.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.ProBBelegung7.setObjectName("ProBBelegung7") - self.gridLayout_2.addWidget(self.ProBBelegung7, 6, 2, 1, 1) - self.ProBBelegung4 = QtWidgets.QProgressBar(self.tab_4) - self.ProBBelegung4.setMinimumSize(QtCore.QSize(250, 29)) - self.ProBBelegung4.setMaximumSize(QtCore.QSize(1000, 100)) + self.gridLayout_2.addWidget(self.ProBBelegung7, 6, 3, 1, 1) + self.ProBBelegung2 = QtWidgets.QProgressBar(self.tab_4) + self.ProBBelegung2.setMinimumSize(QtCore.QSize(250, 29)) + self.ProBBelegung2.setMaximumSize(QtCore.QSize(1000, 100)) font = QtGui.QFont() font.setPointSize(14) font.setBold(True) font.setWeight(75) - self.ProBBelegung4.setFont(font) - self.ProBBelegung4.setProperty("value", 100) - self.ProBBelegung4.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) - self.ProBBelegung4.setObjectName("ProBBelegung4") - self.gridLayout_2.addWidget(self.ProBBelegung4, 3, 2, 1, 1) + self.ProBBelegung2.setFont(font) + self.ProBBelegung2.setProperty("value", 50) + self.ProBBelegung2.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ProBBelegung2.setObjectName("ProBBelegung2") + self.gridLayout_2.addWidget(self.ProBBelegung2, 1, 3, 1, 1) + self.ProBBelegung6 = QtWidgets.QProgressBar(self.tab_4) + self.ProBBelegung6.setMinimumSize(QtCore.QSize(250, 29)) + self.ProBBelegung6.setMaximumSize(QtCore.QSize(1000, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.ProBBelegung6.setFont(font) + self.ProBBelegung6.setProperty("value", 90) + self.ProBBelegung6.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ProBBelegung6.setObjectName("ProBBelegung6") + self.gridLayout_2.addWidget(self.ProBBelegung6, 5, 3, 1, 1) self.ProBBelegung5 = QtWidgets.QProgressBar(self.tab_4) self.ProBBelegung5.setMinimumSize(QtCore.QSize(250, 29)) self.ProBBelegung5.setMaximumSize(QtCore.QSize(1000, 100)) @@ -1477,19 +1465,19 @@ def setupUi(self, MainWindow): self.ProBBelegung5.setProperty("value", 95) self.ProBBelegung5.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.ProBBelegung5.setObjectName("ProBBelegung5") - self.gridLayout_2.addWidget(self.ProBBelegung5, 4, 2, 1, 1) - self.ProBBelegung10 = QtWidgets.QProgressBar(self.tab_4) - self.ProBBelegung10.setMinimumSize(QtCore.QSize(250, 29)) - self.ProBBelegung10.setMaximumSize(QtCore.QSize(1000, 100)) + self.gridLayout_2.addWidget(self.ProBBelegung5, 4, 3, 1, 1) + self.ProBBelegung4 = QtWidgets.QProgressBar(self.tab_4) + self.ProBBelegung4.setMinimumSize(QtCore.QSize(250, 29)) + self.ProBBelegung4.setMaximumSize(QtCore.QSize(1000, 100)) font = QtGui.QFont() font.setPointSize(14) font.setBold(True) font.setWeight(75) - self.ProBBelegung10.setFont(font) - self.ProBBelegung10.setProperty("value", 10) - self.ProBBelegung10.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) - self.ProBBelegung10.setObjectName("ProBBelegung10") - self.gridLayout_2.addWidget(self.ProBBelegung10, 9, 2, 1, 1) + self.ProBBelegung4.setFont(font) + self.ProBBelegung4.setProperty("value", 100) + self.ProBBelegung4.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ProBBelegung4.setObjectName("ProBBelegung4") + self.gridLayout_2.addWidget(self.ProBBelegung4, 3, 3, 1, 1) self.ProBBelegung9 = QtWidgets.QProgressBar(self.tab_4) self.ProBBelegung9.setMinimumSize(QtCore.QSize(250, 29)) self.ProBBelegung9.setMaximumSize(QtCore.QSize(1000, 100)) @@ -1501,7 +1489,19 @@ def setupUi(self, MainWindow): self.ProBBelegung9.setProperty("value", 24) self.ProBBelegung9.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.ProBBelegung9.setObjectName("ProBBelegung9") - self.gridLayout_2.addWidget(self.ProBBelegung9, 8, 2, 1, 1) + self.gridLayout_2.addWidget(self.ProBBelegung9, 8, 3, 1, 1) + self.ProBBelegung10 = QtWidgets.QProgressBar(self.tab_4) + self.ProBBelegung10.setMinimumSize(QtCore.QSize(250, 29)) + self.ProBBelegung10.setMaximumSize(QtCore.QSize(1000, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.ProBBelegung10.setFont(font) + self.ProBBelegung10.setProperty("value", 10) + self.ProBBelegung10.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ProBBelegung10.setObjectName("ProBBelegung10") + self.gridLayout_2.addWidget(self.ProBBelegung10, 9, 3, 1, 1) self.ProBBelegung8 = QtWidgets.QProgressBar(self.tab_4) self.ProBBelegung8.setMinimumSize(QtCore.QSize(250, 29)) self.ProBBelegung8.setMaximumSize(QtCore.QSize(1000, 100)) @@ -1513,7 +1513,7 @@ def setupUi(self, MainWindow): self.ProBBelegung8.setProperty("value", 99) self.ProBBelegung8.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.ProBBelegung8.setObjectName("ProBBelegung8") - self.gridLayout_2.addWidget(self.ProBBelegung8, 7, 2, 1, 1) + self.gridLayout_2.addWidget(self.ProBBelegung8, 7, 3, 1, 1) self.CBB2 = QtWidgets.QComboBox(self.tab_4) self.CBB2.setMinimumSize(QtCore.QSize(103, 29)) self.CBB2.setMaximumSize(QtCore.QSize(300, 100)) @@ -1522,7 +1522,7 @@ def setupUi(self, MainWindow): self.CBB2.setFont(font) self.CBB2.setMaxVisibleItems(11) self.CBB2.setObjectName("CBB2") - self.gridLayout_2.addWidget(self.CBB2, 1, 3, 1, 2) + self.gridLayout_2.addWidget(self.CBB2, 1, 4, 1, 2) self.CBB3 = QtWidgets.QComboBox(self.tab_4) self.CBB3.setMinimumSize(QtCore.QSize(103, 29)) self.CBB3.setMaximumSize(QtCore.QSize(300, 100)) @@ -1531,7 +1531,7 @@ def setupUi(self, MainWindow): self.CBB3.setFont(font) self.CBB3.setMaxVisibleItems(11) self.CBB3.setObjectName("CBB3") - self.gridLayout_2.addWidget(self.CBB3, 2, 3, 1, 2) + self.gridLayout_2.addWidget(self.CBB3, 2, 4, 1, 2) self.CBB4 = QtWidgets.QComboBox(self.tab_4) self.CBB4.setMinimumSize(QtCore.QSize(103, 29)) self.CBB4.setMaximumSize(QtCore.QSize(300, 100)) @@ -1540,7 +1540,7 @@ def setupUi(self, MainWindow): self.CBB4.setFont(font) self.CBB4.setMaxVisibleItems(11) self.CBB4.setObjectName("CBB4") - self.gridLayout_2.addWidget(self.CBB4, 3, 3, 1, 2) + self.gridLayout_2.addWidget(self.CBB4, 3, 4, 1, 2) self.CBB5 = QtWidgets.QComboBox(self.tab_4) self.CBB5.setMinimumSize(QtCore.QSize(103, 29)) self.CBB5.setMaximumSize(QtCore.QSize(300, 100)) @@ -1549,7 +1549,7 @@ def setupUi(self, MainWindow): self.CBB5.setFont(font) self.CBB5.setMaxVisibleItems(11) self.CBB5.setObjectName("CBB5") - self.gridLayout_2.addWidget(self.CBB5, 4, 3, 1, 2) + self.gridLayout_2.addWidget(self.CBB5, 4, 4, 1, 2) self.CBB6 = QtWidgets.QComboBox(self.tab_4) self.CBB6.setMinimumSize(QtCore.QSize(103, 29)) self.CBB6.setMaximumSize(QtCore.QSize(300, 100)) @@ -1558,7 +1558,7 @@ def setupUi(self, MainWindow): self.CBB6.setFont(font) self.CBB6.setMaxVisibleItems(11) self.CBB6.setObjectName("CBB6") - self.gridLayout_2.addWidget(self.CBB6, 5, 3, 1, 2) + self.gridLayout_2.addWidget(self.CBB6, 5, 4, 1, 2) self.CBB7 = QtWidgets.QComboBox(self.tab_4) self.CBB7.setMinimumSize(QtCore.QSize(103, 29)) self.CBB7.setMaximumSize(QtCore.QSize(300, 100)) @@ -1567,7 +1567,7 @@ def setupUi(self, MainWindow): self.CBB7.setFont(font) self.CBB7.setMaxVisibleItems(11) self.CBB7.setObjectName("CBB7") - self.gridLayout_2.addWidget(self.CBB7, 6, 3, 1, 2) + self.gridLayout_2.addWidget(self.CBB7, 6, 4, 1, 2) self.CBB8 = QtWidgets.QComboBox(self.tab_4) self.CBB8.setMinimumSize(QtCore.QSize(103, 29)) self.CBB8.setMaximumSize(QtCore.QSize(300, 100)) @@ -1576,7 +1576,7 @@ def setupUi(self, MainWindow): self.CBB8.setFont(font) self.CBB8.setMaxVisibleItems(11) self.CBB8.setObjectName("CBB8") - self.gridLayout_2.addWidget(self.CBB8, 7, 3, 1, 2) + self.gridLayout_2.addWidget(self.CBB8, 7, 4, 1, 2) self.CBB9 = QtWidgets.QComboBox(self.tab_4) self.CBB9.setMinimumSize(QtCore.QSize(103, 29)) self.CBB9.setMaximumSize(QtCore.QSize(300, 100)) @@ -1585,7 +1585,19 @@ def setupUi(self, MainWindow): self.CBB9.setFont(font) self.CBB9.setMaxVisibleItems(11) self.CBB9.setObjectName("CBB9") - self.gridLayout_2.addWidget(self.CBB9, 8, 3, 1, 2) + self.gridLayout_2.addWidget(self.CBB9, 8, 4, 1, 2) + self.bottleLabel2 = QtWidgets.QLabel(self.tab_4) + self.bottleLabel2.setMinimumSize(QtCore.QSize(0, 29)) + self.bottleLabel2.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(22) + font.setBold(True) + font.setWeight(75) + self.bottleLabel2.setFont(font) + self.bottleLabel2.setStyleSheet(" color: rgb(239, 151, 0);") + self.bottleLabel2.setAlignment(QtCore.Qt.AlignCenter) + self.bottleLabel2.setObjectName("bottleLabel2") + self.gridLayout_2.addWidget(self.bottleLabel2, 1, 6, 1, 1) self.CBB10 = QtWidgets.QComboBox(self.tab_4) self.CBB10.setMinimumSize(QtCore.QSize(103, 29)) self.CBB10.setMaximumSize(QtCore.QSize(300, 100)) @@ -1594,7 +1606,7 @@ def setupUi(self, MainWindow): self.CBB10.setFont(font) self.CBB10.setMaxVisibleItems(11) self.CBB10.setObjectName("CBB10") - self.gridLayout_2.addWidget(self.CBB10, 9, 3, 1, 2) + self.gridLayout_2.addWidget(self.CBB10, 9, 4, 1, 2) self.bottleLabel4 = QtWidgets.QLabel(self.tab_4) self.bottleLabel4.setMinimumSize(QtCore.QSize(0, 29)) self.bottleLabel4.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1606,19 +1618,7 @@ def setupUi(self, MainWindow): self.bottleLabel4.setStyleSheet(" color: rgb(239, 151, 0);") self.bottleLabel4.setAlignment(QtCore.Qt.AlignCenter) self.bottleLabel4.setObjectName("bottleLabel4") - self.gridLayout_2.addWidget(self.bottleLabel4, 3, 5, 1, 1) - self.bottleLabel2 = QtWidgets.QLabel(self.tab_4) - self.bottleLabel2.setMinimumSize(QtCore.QSize(0, 29)) - self.bottleLabel2.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(22) - font.setBold(True) - font.setWeight(75) - self.bottleLabel2.setFont(font) - self.bottleLabel2.setStyleSheet(" color: rgb(239, 151, 0);") - self.bottleLabel2.setAlignment(QtCore.Qt.AlignCenter) - self.bottleLabel2.setObjectName("bottleLabel2") - self.gridLayout_2.addWidget(self.bottleLabel2, 1, 5, 1, 1) + self.gridLayout_2.addWidget(self.bottleLabel4, 3, 6, 1, 1) self.bottleLabel3 = QtWidgets.QLabel(self.tab_4) self.bottleLabel3.setMinimumSize(QtCore.QSize(0, 29)) self.bottleLabel3.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1630,7 +1630,19 @@ def setupUi(self, MainWindow): self.bottleLabel3.setStyleSheet(" color: rgb(239, 151, 0);") self.bottleLabel3.setAlignment(QtCore.Qt.AlignCenter) self.bottleLabel3.setObjectName("bottleLabel3") - self.gridLayout_2.addWidget(self.bottleLabel3, 2, 5, 1, 1) + self.gridLayout_2.addWidget(self.bottleLabel3, 2, 6, 1, 1) + self.bottleLabel5 = QtWidgets.QLabel(self.tab_4) + self.bottleLabel5.setMinimumSize(QtCore.QSize(0, 29)) + self.bottleLabel5.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(22) + font.setBold(True) + font.setWeight(75) + self.bottleLabel5.setFont(font) + self.bottleLabel5.setStyleSheet(" color: rgb(239, 151, 0);") + self.bottleLabel5.setAlignment(QtCore.Qt.AlignCenter) + self.bottleLabel5.setObjectName("bottleLabel5") + self.gridLayout_2.addWidget(self.bottleLabel5, 4, 6, 1, 1) self.bottleLabel7 = QtWidgets.QLabel(self.tab_4) self.bottleLabel7.setMinimumSize(QtCore.QSize(0, 29)) self.bottleLabel7.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1642,7 +1654,7 @@ def setupUi(self, MainWindow): self.bottleLabel7.setStyleSheet(" color: rgb(239, 151, 0);") self.bottleLabel7.setAlignment(QtCore.Qt.AlignCenter) self.bottleLabel7.setObjectName("bottleLabel7") - self.gridLayout_2.addWidget(self.bottleLabel7, 6, 5, 1, 1) + self.gridLayout_2.addWidget(self.bottleLabel7, 6, 6, 1, 1) self.bottleLabel6 = QtWidgets.QLabel(self.tab_4) self.bottleLabel6.setMinimumSize(QtCore.QSize(0, 29)) self.bottleLabel6.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1654,19 +1666,7 @@ def setupUi(self, MainWindow): self.bottleLabel6.setStyleSheet(" color: rgb(239, 151, 0);") self.bottleLabel6.setAlignment(QtCore.Qt.AlignCenter) self.bottleLabel6.setObjectName("bottleLabel6") - self.gridLayout_2.addWidget(self.bottleLabel6, 5, 5, 1, 1) - self.bottleLabel5 = QtWidgets.QLabel(self.tab_4) - self.bottleLabel5.setMinimumSize(QtCore.QSize(0, 29)) - self.bottleLabel5.setMaximumSize(QtCore.QSize(16777215, 100)) - font = QtGui.QFont() - font.setPointSize(22) - font.setBold(True) - font.setWeight(75) - self.bottleLabel5.setFont(font) - self.bottleLabel5.setStyleSheet(" color: rgb(239, 151, 0);") - self.bottleLabel5.setAlignment(QtCore.Qt.AlignCenter) - self.bottleLabel5.setObjectName("bottleLabel5") - self.gridLayout_2.addWidget(self.bottleLabel5, 4, 5, 1, 1) + self.gridLayout_2.addWidget(self.bottleLabel6, 5, 6, 1, 1) self.bottleLabel9 = QtWidgets.QLabel(self.tab_4) self.bottleLabel9.setMinimumSize(QtCore.QSize(0, 29)) self.bottleLabel9.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1678,7 +1678,7 @@ def setupUi(self, MainWindow): self.bottleLabel9.setStyleSheet(" color: rgb(239, 151, 0);") self.bottleLabel9.setAlignment(QtCore.Qt.AlignCenter) self.bottleLabel9.setObjectName("bottleLabel9") - self.gridLayout_2.addWidget(self.bottleLabel9, 8, 5, 1, 1) + self.gridLayout_2.addWidget(self.bottleLabel9, 8, 6, 1, 1) self.bottleLabel8 = QtWidgets.QLabel(self.tab_4) self.bottleLabel8.setMinimumSize(QtCore.QSize(0, 29)) self.bottleLabel8.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1690,7 +1690,7 @@ def setupUi(self, MainWindow): self.bottleLabel8.setStyleSheet(" color: rgb(239, 151, 0);") self.bottleLabel8.setAlignment(QtCore.Qt.AlignCenter) self.bottleLabel8.setObjectName("bottleLabel8") - self.gridLayout_2.addWidget(self.bottleLabel8, 7, 5, 1, 1) + self.gridLayout_2.addWidget(self.bottleLabel8, 7, 6, 1, 1) self.bottleLabel10 = QtWidgets.QLabel(self.tab_4) self.bottleLabel10.setMinimumSize(QtCore.QSize(0, 29)) self.bottleLabel10.setMaximumSize(QtCore.QSize(16777215, 100)) @@ -1702,7 +1702,325 @@ def setupUi(self, MainWindow): self.bottleLabel10.setStyleSheet(" color: rgb(239, 151, 0);") self.bottleLabel10.setAlignment(QtCore.Qt.AlignCenter) self.bottleLabel10.setObjectName("bottleLabel10") - self.gridLayout_2.addWidget(self.bottleLabel10, 9, 5, 1, 1) + self.gridLayout_2.addWidget(self.bottleLabel10, 9, 6, 1, 1) + self.PBneu12 = QtWidgets.QPushButton(self.tab_4) + self.PBneu12.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu12.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu12.setFont(font) + self.PBneu12.setCheckable(True) + self.PBneu12.setObjectName("PBneu12") + self.gridLayout_2.addWidget(self.PBneu12, 11, 0, 1, 1) + self.PBneu11 = QtWidgets.QPushButton(self.tab_4) + self.PBneu11.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu11.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu11.setFont(font) + self.PBneu11.setCheckable(True) + self.PBneu11.setObjectName("PBneu11") + self.gridLayout_2.addWidget(self.PBneu11, 10, 0, 1, 1) + self.PBneu13 = QtWidgets.QPushButton(self.tab_4) + self.PBneu13.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu13.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu13.setFont(font) + self.PBneu13.setCheckable(True) + self.PBneu13.setObjectName("PBneu13") + self.gridLayout_2.addWidget(self.PBneu13, 13, 0, 1, 1) + self.PBneu15 = QtWidgets.QPushButton(self.tab_4) + self.PBneu15.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu15.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu15.setFont(font) + self.PBneu15.setCheckable(True) + self.PBneu15.setObjectName("PBneu15") + self.gridLayout_2.addWidget(self.PBneu15, 15, 0, 1, 1) + self.PBneu14 = QtWidgets.QPushButton(self.tab_4) + self.PBneu14.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu14.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu14.setFont(font) + self.PBneu14.setCheckable(True) + self.PBneu14.setObjectName("PBneu14") + self.gridLayout_2.addWidget(self.PBneu14, 14, 0, 1, 1) + self.PBneu16 = QtWidgets.QPushButton(self.tab_4) + self.PBneu16.setMinimumSize(QtCore.QSize(50, 29)) + self.PBneu16.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.PBneu16.setFont(font) + self.PBneu16.setCheckable(True) + self.PBneu16.setObjectName("PBneu16") + self.gridLayout_2.addWidget(self.PBneu16, 16, 0, 1, 1) + self.LBelegung11 = QtWidgets.QLabel(self.tab_4) + self.LBelegung11.setMinimumSize(QtCore.QSize(120, 29)) + self.LBelegung11.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(12) + self.LBelegung11.setFont(font) + self.LBelegung11.setStyleSheet(" color: rgb(239, 151, 0);") + self.LBelegung11.setObjectName("LBelegung11") + self.gridLayout_2.addWidget(self.LBelegung11, 10, 1, 1, 1) + self.LBelegung13 = QtWidgets.QLabel(self.tab_4) + self.LBelegung13.setMinimumSize(QtCore.QSize(120, 29)) + self.LBelegung13.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(12) + self.LBelegung13.setFont(font) + self.LBelegung13.setStyleSheet(" color: rgb(239, 151, 0);") + self.LBelegung13.setObjectName("LBelegung13") + self.gridLayout_2.addWidget(self.LBelegung13, 13, 1, 1, 1) + self.LBelegung12 = QtWidgets.QLabel(self.tab_4) + self.LBelegung12.setMinimumSize(QtCore.QSize(120, 29)) + self.LBelegung12.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(12) + self.LBelegung12.setFont(font) + self.LBelegung12.setStyleSheet(" color: rgb(239, 151, 0);") + self.LBelegung12.setObjectName("LBelegung12") + self.gridLayout_2.addWidget(self.LBelegung12, 11, 1, 1, 1) + self.LBelegung15 = QtWidgets.QLabel(self.tab_4) + self.LBelegung15.setMinimumSize(QtCore.QSize(120, 29)) + self.LBelegung15.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(12) + self.LBelegung15.setFont(font) + self.LBelegung15.setStyleSheet(" color: rgb(239, 151, 0);") + self.LBelegung15.setObjectName("LBelegung15") + self.gridLayout_2.addWidget(self.LBelegung15, 15, 1, 1, 1) + self.LBelegung14 = QtWidgets.QLabel(self.tab_4) + self.LBelegung14.setMinimumSize(QtCore.QSize(120, 29)) + self.LBelegung14.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(12) + self.LBelegung14.setFont(font) + self.LBelegung14.setStyleSheet(" color: rgb(239, 151, 0);") + self.LBelegung14.setObjectName("LBelegung14") + self.gridLayout_2.addWidget(self.LBelegung14, 14, 1, 1, 1) + self.LBelegung16 = QtWidgets.QLabel(self.tab_4) + self.LBelegung16.setMinimumSize(QtCore.QSize(120, 29)) + self.LBelegung16.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(12) + self.LBelegung16.setFont(font) + self.LBelegung16.setStyleSheet(" color: rgb(239, 151, 0);") + self.LBelegung16.setObjectName("LBelegung16") + self.gridLayout_2.addWidget(self.LBelegung16, 16, 1, 1, 1) + self.ProBBelegung12 = QtWidgets.QProgressBar(self.tab_4) + self.ProBBelegung12.setMinimumSize(QtCore.QSize(250, 29)) + self.ProBBelegung12.setMaximumSize(QtCore.QSize(1000, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.ProBBelegung12.setFont(font) + self.ProBBelegung12.setProperty("value", 10) + self.ProBBelegung12.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ProBBelegung12.setObjectName("ProBBelegung12") + self.gridLayout_2.addWidget(self.ProBBelegung12, 11, 3, 1, 1) + self.ProBBelegung11 = QtWidgets.QProgressBar(self.tab_4) + self.ProBBelegung11.setMinimumSize(QtCore.QSize(250, 29)) + self.ProBBelegung11.setMaximumSize(QtCore.QSize(1000, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.ProBBelegung11.setFont(font) + self.ProBBelegung11.setProperty("value", 10) + self.ProBBelegung11.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ProBBelegung11.setObjectName("ProBBelegung11") + self.gridLayout_2.addWidget(self.ProBBelegung11, 10, 3, 1, 1) + self.ProBBelegung13 = QtWidgets.QProgressBar(self.tab_4) + self.ProBBelegung13.setMinimumSize(QtCore.QSize(250, 29)) + self.ProBBelegung13.setMaximumSize(QtCore.QSize(1000, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.ProBBelegung13.setFont(font) + self.ProBBelegung13.setProperty("value", 10) + self.ProBBelegung13.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ProBBelegung13.setObjectName("ProBBelegung13") + self.gridLayout_2.addWidget(self.ProBBelegung13, 13, 3, 1, 1) + self.ProBBelegung14 = QtWidgets.QProgressBar(self.tab_4) + self.ProBBelegung14.setMinimumSize(QtCore.QSize(250, 29)) + self.ProBBelegung14.setMaximumSize(QtCore.QSize(1000, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.ProBBelegung14.setFont(font) + self.ProBBelegung14.setProperty("value", 10) + self.ProBBelegung14.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ProBBelegung14.setObjectName("ProBBelegung14") + self.gridLayout_2.addWidget(self.ProBBelegung14, 14, 3, 1, 1) + self.ProBBelegung15 = QtWidgets.QProgressBar(self.tab_4) + self.ProBBelegung15.setMinimumSize(QtCore.QSize(250, 29)) + self.ProBBelegung15.setMaximumSize(QtCore.QSize(1000, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.ProBBelegung15.setFont(font) + self.ProBBelegung15.setProperty("value", 10) + self.ProBBelegung15.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ProBBelegung15.setObjectName("ProBBelegung15") + self.gridLayout_2.addWidget(self.ProBBelegung15, 15, 3, 1, 1) + self.ProBBelegung16 = QtWidgets.QProgressBar(self.tab_4) + self.ProBBelegung16.setMinimumSize(QtCore.QSize(250, 29)) + self.ProBBelegung16.setMaximumSize(QtCore.QSize(1000, 100)) + font = QtGui.QFont() + font.setPointSize(14) + font.setBold(True) + font.setWeight(75) + self.ProBBelegung16.setFont(font) + self.ProBBelegung16.setProperty("value", 10) + self.ProBBelegung16.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.ProBBelegung16.setObjectName("ProBBelegung16") + self.gridLayout_2.addWidget(self.ProBBelegung16, 16, 3, 1, 1) + self.CBB11 = QtWidgets.QComboBox(self.tab_4) + self.CBB11.setMinimumSize(QtCore.QSize(103, 29)) + self.CBB11.setMaximumSize(QtCore.QSize(300, 100)) + font = QtGui.QFont() + font.setPointSize(14) + self.CBB11.setFont(font) + self.CBB11.setMaxVisibleItems(11) + self.CBB11.setObjectName("CBB11") + self.gridLayout_2.addWidget(self.CBB11, 10, 4, 1, 2) + self.CBB12 = QtWidgets.QComboBox(self.tab_4) + self.CBB12.setMinimumSize(QtCore.QSize(103, 29)) + self.CBB12.setMaximumSize(QtCore.QSize(300, 100)) + font = QtGui.QFont() + font.setPointSize(14) + self.CBB12.setFont(font) + self.CBB12.setMaxVisibleItems(11) + self.CBB12.setObjectName("CBB12") + self.gridLayout_2.addWidget(self.CBB12, 11, 4, 1, 2) + self.CBB13 = QtWidgets.QComboBox(self.tab_4) + self.CBB13.setMinimumSize(QtCore.QSize(103, 29)) + self.CBB13.setMaximumSize(QtCore.QSize(300, 100)) + font = QtGui.QFont() + font.setPointSize(14) + self.CBB13.setFont(font) + self.CBB13.setMaxVisibleItems(11) + self.CBB13.setObjectName("CBB13") + self.gridLayout_2.addWidget(self.CBB13, 13, 4, 1, 2) + self.CBB14 = QtWidgets.QComboBox(self.tab_4) + self.CBB14.setMinimumSize(QtCore.QSize(103, 29)) + self.CBB14.setMaximumSize(QtCore.QSize(300, 100)) + font = QtGui.QFont() + font.setPointSize(14) + self.CBB14.setFont(font) + self.CBB14.setMaxVisibleItems(11) + self.CBB14.setObjectName("CBB14") + self.gridLayout_2.addWidget(self.CBB14, 14, 4, 1, 2) + self.CBB15 = QtWidgets.QComboBox(self.tab_4) + self.CBB15.setMinimumSize(QtCore.QSize(103, 29)) + self.CBB15.setMaximumSize(QtCore.QSize(300, 100)) + font = QtGui.QFont() + font.setPointSize(14) + self.CBB15.setFont(font) + self.CBB15.setMaxVisibleItems(11) + self.CBB15.setObjectName("CBB15") + self.gridLayout_2.addWidget(self.CBB15, 15, 4, 1, 2) + self.CBB16 = QtWidgets.QComboBox(self.tab_4) + self.CBB16.setMinimumSize(QtCore.QSize(103, 29)) + self.CBB16.setMaximumSize(QtCore.QSize(300, 100)) + font = QtGui.QFont() + font.setPointSize(14) + self.CBB16.setFont(font) + self.CBB16.setMaxVisibleItems(11) + self.CBB16.setObjectName("CBB16") + self.gridLayout_2.addWidget(self.CBB16, 16, 4, 1, 2) + self.bottleLabel11 = QtWidgets.QLabel(self.tab_4) + self.bottleLabel11.setMinimumSize(QtCore.QSize(0, 29)) + self.bottleLabel11.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(22) + font.setBold(True) + font.setWeight(75) + self.bottleLabel11.setFont(font) + self.bottleLabel11.setStyleSheet(" color: rgb(239, 151, 0);") + self.bottleLabel11.setAlignment(QtCore.Qt.AlignCenter) + self.bottleLabel11.setObjectName("bottleLabel11") + self.gridLayout_2.addWidget(self.bottleLabel11, 10, 6, 1, 1) + self.bottleLabel12 = QtWidgets.QLabel(self.tab_4) + self.bottleLabel12.setMinimumSize(QtCore.QSize(0, 29)) + self.bottleLabel12.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(22) + font.setBold(True) + font.setWeight(75) + self.bottleLabel12.setFont(font) + self.bottleLabel12.setStyleSheet(" color: rgb(239, 151, 0);") + self.bottleLabel12.setAlignment(QtCore.Qt.AlignCenter) + self.bottleLabel12.setObjectName("bottleLabel12") + self.gridLayout_2.addWidget(self.bottleLabel12, 11, 6, 1, 1) + self.bottleLabel13 = QtWidgets.QLabel(self.tab_4) + self.bottleLabel13.setMinimumSize(QtCore.QSize(0, 29)) + self.bottleLabel13.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(22) + font.setBold(True) + font.setWeight(75) + self.bottleLabel13.setFont(font) + self.bottleLabel13.setStyleSheet(" color: rgb(239, 151, 0);") + self.bottleLabel13.setAlignment(QtCore.Qt.AlignCenter) + self.bottleLabel13.setObjectName("bottleLabel13") + self.gridLayout_2.addWidget(self.bottleLabel13, 13, 6, 1, 1) + self.bottleLabel14 = QtWidgets.QLabel(self.tab_4) + self.bottleLabel14.setMinimumSize(QtCore.QSize(0, 29)) + self.bottleLabel14.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(22) + font.setBold(True) + font.setWeight(75) + self.bottleLabel14.setFont(font) + self.bottleLabel14.setStyleSheet(" color: rgb(239, 151, 0);") + self.bottleLabel14.setAlignment(QtCore.Qt.AlignCenter) + self.bottleLabel14.setObjectName("bottleLabel14") + self.gridLayout_2.addWidget(self.bottleLabel14, 14, 6, 1, 1) + self.bottleLabel15 = QtWidgets.QLabel(self.tab_4) + self.bottleLabel15.setMinimumSize(QtCore.QSize(0, 29)) + self.bottleLabel15.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(22) + font.setBold(True) + font.setWeight(75) + self.bottleLabel15.setFont(font) + self.bottleLabel15.setStyleSheet(" color: rgb(239, 151, 0);") + self.bottleLabel15.setAlignment(QtCore.Qt.AlignCenter) + self.bottleLabel15.setObjectName("bottleLabel15") + self.gridLayout_2.addWidget(self.bottleLabel15, 15, 6, 1, 1) + self.bottleLabel16 = QtWidgets.QLabel(self.tab_4) + self.bottleLabel16.setMinimumSize(QtCore.QSize(0, 29)) + self.bottleLabel16.setMaximumSize(QtCore.QSize(16777215, 100)) + font = QtGui.QFont() + font.setPointSize(22) + font.setBold(True) + font.setWeight(75) + self.bottleLabel16.setFont(font) + self.bottleLabel16.setStyleSheet(" color: rgb(239, 151, 0);") + self.bottleLabel16.setAlignment(QtCore.Qt.AlignCenter) + self.bottleLabel16.setObjectName("bottleLabel16") + self.gridLayout_2.addWidget(self.bottleLabel16, 16, 6, 1, 1) self.horizontalLayout_12.addLayout(self.gridLayout_2) self.tabWidget.addTab(self.tab_4, "") self.verticalLayout.addWidget(self.tabWidget) @@ -1784,16 +2102,6 @@ def retranslateUi(self, MainWindow): self.PBRezepthinzu.setText(_translate("MainWindow", "hinzufügen")) self.LRHandAdd.setText(_translate("MainWindow", "

Selbst hinzufügen:

")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("MainWindow", "Rezepte")) - self.LBelegung8.setText(_translate("MainWindow", "LBelegung8")) - self.LBelegung7.setText(_translate("MainWindow", "LBelegung7")) - self.LBelegung9.setText(_translate("MainWindow", "LBelegung9")) - self.PBneu2.setText(_translate("MainWindow", "new")) - self.PBneu5.setText(_translate("MainWindow", "new")) - self.PBneu6.setText(_translate("MainWindow", "new")) - self.PBneu7.setText(_translate("MainWindow", "new")) - self.PBneu9.setText(_translate("MainWindow", "new")) - self.PBFlanwenden.setText(_translate("MainWindow", "neue Flaschen anwenden")) - self.PBneu10.setText(_translate("MainWindow", "new")) self.PBneu8.setText(_translate("MainWindow", "new")) self.LBelegung2.setText(_translate("MainWindow", "LBelegung2")) self.LBelegung3.setText(_translate("MainWindow", "LBelegung3")) @@ -1802,21 +2110,49 @@ def retranslateUi(self, MainWindow): self.LBelegung6.setText(_translate("MainWindow", "LBelegung6")) self.PBneu3.setText(_translate("MainWindow", "new")) self.PBBelegung.setText(_translate("MainWindow", "ändern")) - self.PBneu4.setText(_translate("MainWindow", "new")) self.PBCleanMachine.setText(_translate("MainWindow", "CLEAN")) + self.PBneu4.setText(_translate("MainWindow", "new")) self.bottleLabel1.setText(_translate("MainWindow", "1")) - self.PBneu1.setText(_translate("MainWindow", "new")) + self.PBneu10.setText(_translate("MainWindow", "new")) + self.PBneu5.setText(_translate("MainWindow", "new")) + self.LBelegung9.setText(_translate("MainWindow", "LBelegung9")) + self.PBneu2.setText(_translate("MainWindow", "new")) + self.PBneu9.setText(_translate("MainWindow", "new")) + self.PBFlanwenden.setText(_translate("MainWindow", "neue Flaschen anwenden")) + self.PBneu7.setText(_translate("MainWindow", "new")) + self.PBneu6.setText(_translate("MainWindow", "new")) + self.LBelegung7.setText(_translate("MainWindow", "LBelegung7")) + self.LBelegung8.setText(_translate("MainWindow", "LBelegung8")) self.LBelegung1.setText(_translate("MainWindow", "LBelegung1")) + self.PBneu1.setText(_translate("MainWindow", "new")) self.LBelegung10.setText(_translate("MainWindow", "LBelegung10")) - self.bottleLabel4.setText(_translate("MainWindow", "4")) self.bottleLabel2.setText(_translate("MainWindow", "2")) + self.bottleLabel4.setText(_translate("MainWindow", "4")) self.bottleLabel3.setText(_translate("MainWindow", "3")) + self.bottleLabel5.setText(_translate("MainWindow", "5")) self.bottleLabel7.setText(_translate("MainWindow", "7")) self.bottleLabel6.setText(_translate("MainWindow", "6")) - self.bottleLabel5.setText(_translate("MainWindow", "5")) self.bottleLabel9.setText(_translate("MainWindow", "9")) self.bottleLabel8.setText(_translate("MainWindow", "8")) self.bottleLabel10.setText(_translate("MainWindow", "10")) + self.PBneu12.setText(_translate("MainWindow", "new")) + self.PBneu11.setText(_translate("MainWindow", "new")) + self.PBneu13.setText(_translate("MainWindow", "new")) + self.PBneu15.setText(_translate("MainWindow", "new")) + self.PBneu14.setText(_translate("MainWindow", "new")) + self.PBneu16.setText(_translate("MainWindow", "new")) + self.LBelegung11.setText(_translate("MainWindow", "LBelegung11")) + self.LBelegung13.setText(_translate("MainWindow", "LBelegung13")) + self.LBelegung12.setText(_translate("MainWindow", "LBelegung12")) + self.LBelegung15.setText(_translate("MainWindow", "LBelegung15")) + self.LBelegung14.setText(_translate("MainWindow", "LBelegung14")) + self.LBelegung16.setText(_translate("MainWindow", "LBelegung16")) + self.bottleLabel11.setText(_translate("MainWindow", "11")) + self.bottleLabel12.setText(_translate("MainWindow", "12")) + self.bottleLabel13.setText(_translate("MainWindow", "13")) + self.bottleLabel14.setText(_translate("MainWindow", "14")) + self.bottleLabel15.setText(_translate("MainWindow", "15")) + self.bottleLabel16.setText(_translate("MainWindow", "16")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), _translate("MainWindow", "Belegung")) self.actionCocktailmaker.setText(_translate("MainWindow", "Cocktailmaker")) self.actionZutatenmanager.setText(_translate("MainWindow", "Zutatenmanager")) diff --git a/src/ui_elements/Cocktailmanager_2.ui b/src/ui_elements/Cocktailmanager_2.ui index 758bca0e..88bed771 100644 --- a/src/ui_elements/Cocktailmanager_2.ui +++ b/src/ui_elements/Cocktailmanager_2.ui @@ -7,7 +7,7 @@ 0 0 800 - 485 + 700 @@ -19,7 +19,7 @@ 800 - 485 + 700 @@ -2359,38 +2359,38 @@ QScrollBar::up-arrow:vertical { - - + + - 120 + 103 29 - 16777215 + 300 100 - 12 + 14 - - color: rgb(239, 151, 0); + + ArrowCursor - - LBelegung8 + + 11 - - + + - 120 + 50 29 @@ -2402,19 +2402,21 @@ QScrollBar::up-arrow:vertical { - 12 + 14 + 75 + true - - color: rgb(239, 151, 0); - - LBelegung7 + new + + + true - - + + 120 @@ -2436,15 +2438,15 @@ QScrollBar::up-arrow:vertical { color: rgb(239, 151, 0); - LBelegung9 + LBelegung2 - - + + - 50 + 120 29 @@ -2456,24 +2458,22 @@ QScrollBar::up-arrow:vertical { - 14 - 75 - true + 12 - - new + + color: rgb(239, 151, 0); - - true + + LBelegung3 - - + + - 50 + 120 29 @@ -2485,24 +2485,22 @@ QScrollBar::up-arrow:vertical { - 14 - 75 - true + 12 - - new + + color: rgb(239, 151, 0); - - true + + LBelegung4 - - + + - 50 + 120 29 @@ -2514,24 +2512,22 @@ QScrollBar::up-arrow:vertical { - 14 - 75 - true + 12 - - new + + color: rgb(239, 151, 0); - - true + + LBelegung5 - - + + - 50 + 120 29 @@ -2543,21 +2539,19 @@ QScrollBar::up-arrow:vertical { - 14 - 75 - true + 12 - - new + + color: rgb(239, 151, 0); - - true + + LBelegung6 - - + + 50 @@ -2585,11 +2579,11 @@ QScrollBar::up-arrow:vertical { - - + + - 16777215 + 200 100 @@ -2601,40 +2595,15 @@ QScrollBar::up-arrow:vertical { - neue Flaschen anwenden - - - - - - - - 0 - 29 - - - - - 50 - 100 - - - - QLineEdit::Password + ändern - - - - - 50 - 29 - - + + - 16777215 + 200 100 @@ -2646,15 +2615,12 @@ QScrollBar::up-arrow:vertical { - new - - - true + CLEAN - - + + 50 @@ -2682,11 +2648,11 @@ QScrollBar::up-arrow:vertical { - - + + - 120 + 0 29 @@ -2698,22 +2664,27 @@ QScrollBar::up-arrow:vertical { - 12 + 22 + 75 + true color: rgb(239, 151, 0); - LBelegung2 + 1 + + + Qt::AlignCenter - - + + - 120 + 50 29 @@ -2725,22 +2696,24 @@ QScrollBar::up-arrow:vertical { - 12 + 14 + 75 + true - - color: rgb(239, 151, 0); - - LBelegung3 + new + + + true - - + + - 120 + 50 29 @@ -2752,19 +2725,21 @@ QScrollBar::up-arrow:vertical { - 12 + 14 + 75 + true - - color: rgb(239, 151, 0); - - LBelegung4 + new + + + true - - + + 120 @@ -2786,15 +2761,15 @@ QScrollBar::up-arrow:vertical { color: rgb(239, 151, 0); - LBelegung5 + LBelegung9 - - + + - 120 + 50 29 @@ -2806,19 +2781,21 @@ QScrollBar::up-arrow:vertical { - 12 + 14 + 75 + true - - color: rgb(239, 151, 0); - - LBelegung6 + new + + + true - - + + 50 @@ -2846,11 +2823,11 @@ QScrollBar::up-arrow:vertical { - - + + - 200 + 16777215 100 @@ -2862,12 +2839,12 @@ QScrollBar::up-arrow:vertical { - ändern + neue Flaschen anwenden - - + + 50 @@ -2895,11 +2872,17 @@ QScrollBar::up-arrow:vertical { - - - + + + - 200 + 50 + 29 + + + + + 16777215 100 @@ -2911,18 +2894,40 @@ QScrollBar::up-arrow:vertical { - CLEAN + new + + + true - - + + 0 29 + + + 50 + 100 + + + + QLineEdit::Password + + + + + + + + 120 + 29 + + 16777215 @@ -2931,46 +2936,97 @@ QScrollBar::up-arrow:vertical { - 22 - 75 - true + 12 color: rgb(239, 151, 0); - 1 + LBelegung7 - - Qt::AlignCenter + + + + + + + 120 + 29 + + + + + 16777215 + 100 + + + + + 12 + + + + color: rgb(239, 151, 0); + + + LBelegung8 - - + + - 103 + 250 29 - 300 + 1000 100 14 + 75 + true - - ArrowCursor + + 88 - - 11 + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 120 + 29 + + + + + 16777215 + 100 + + + + + 12 + + + + color: rgb(239, 151, 0); + + + LBelegung1 @@ -3006,8 +3062,8 @@ QScrollBar::up-arrow:vertical { - - + + 120 @@ -3029,12 +3085,12 @@ QScrollBar::up-arrow:vertical { color: rgb(239, 151, 0); - LBelegung1 + LBelegung10 - - + + 250 @@ -3055,15 +3111,925 @@ QScrollBar::up-arrow:vertical { - 88 + 70 Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + + + + 250 + 29 + + + + + 1000 + 100 + + + + + 14 + 75 + true + + + + 67 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 250 + 29 + + + + + 1000 + 100 + + + + + 14 + 75 + true + + + + 50 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 250 + 29 + + + + + 1000 + 100 + + + + + 14 + 75 + true + + + + 90 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 250 + 29 + + + + + 1000 + 100 + + + + + 14 + 75 + true + + + + 95 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 250 + 29 + + + + + 1000 + 100 + + + + + 14 + 75 + true + + + + 100 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 250 + 29 + + + + + 1000 + 100 + + + + + 14 + 75 + true + + + + 24 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 250 + 29 + + + + + 1000 + 100 + + + + + 14 + 75 + true + + + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 250 + 29 + + + + + 1000 + 100 + + + + + 14 + 75 + true + + + + 99 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 103 + 29 + + + + + 300 + 100 + + + + + 14 + + + + 11 + + + + + + + + 103 + 29 + + + + + 300 + 100 + + + + + 14 + + + + 11 + + + + + + + + 103 + 29 + + + + + 300 + 100 + + + + + 14 + + + + 11 + + + + + + + + 103 + 29 + + + + + 300 + 100 + + + + + 14 + + + + 11 + + + + + + + + 103 + 29 + + + + + 300 + 100 + + + + + 14 + + + + 11 + + + + + + + + 103 + 29 + + + + + 300 + 100 + + + + + 14 + + + + 11 + + + + + + + + 103 + 29 + + + + + 300 + 100 + + + + + 14 + + + + 11 + + + + + + + + 103 + 29 + + + + + 300 + 100 + + + + + 14 + + + + 11 + + + + + + + + 0 + 29 + + + + + 16777215 + 100 + + + + + 22 + 75 + true + + + + color: rgb(239, 151, 0); + + + 2 + + + Qt::AlignCenter + + + + + + + + 103 + 29 + + + + + 300 + 100 + + + + + 14 + + + + 11 + + + + + + + + 0 + 29 + + + + + 16777215 + 100 + + + + + 22 + 75 + true + + + + color: rgb(239, 151, 0); + + + 4 + + + Qt::AlignCenter + + + + + + + + 0 + 29 + + + + + 16777215 + 100 + + + + + 22 + 75 + true + + + + color: rgb(239, 151, 0); + + + 3 + + + Qt::AlignCenter + + + + + + + + 0 + 29 + + + + + 16777215 + 100 + + + + + 22 + 75 + true + + + + color: rgb(239, 151, 0); + + + 5 + + + Qt::AlignCenter + + + + + + + + 0 + 29 + + + + + 16777215 + 100 + + + + + 22 + 75 + true + + + + color: rgb(239, 151, 0); + + + 7 + + + Qt::AlignCenter + + + + + + + + 0 + 29 + + + + + 16777215 + 100 + + + + + 22 + 75 + true + + + + color: rgb(239, 151, 0); + + + 6 + + + Qt::AlignCenter + + + + + + + + 0 + 29 + + + + + 16777215 + 100 + + + + + 22 + 75 + true + + + + color: rgb(239, 151, 0); + + + 9 + + + Qt::AlignCenter + + + + + + + + 0 + 29 + + + + + 16777215 + 100 + + + + + 22 + 75 + true + + + + color: rgb(239, 151, 0); + + + 8 + + + Qt::AlignCenter + + + + + + + + 0 + 29 + + + + + 16777215 + 100 + + + + + 22 + 75 + true + + + + color: rgb(239, 151, 0); + + + 10 + + + Qt::AlignCenter + + + + + + + + 50 + 29 + + + + + 16777215 + 100 + + + + + 14 + 75 + true + + + + new + + + true + + + + + + + + 50 + 29 + + + + + 16777215 + 100 + + + + + 14 + 75 + true + + + + new + + + true + + + + + + + + 50 + 29 + + + + + 16777215 + 100 + + + + + 14 + 75 + true + + + + new + + + true + + + + + + + + 50 + 29 + + + + + 16777215 + 100 + + + + + 14 + 75 + true + + + + new + + + true + + + + + + + + 50 + 29 + + + + + 16777215 + 100 + + + + + 14 + 75 + true + + + + new + + + true + + + + + + + + 50 + 29 + + + + + 16777215 + 100 + + + + + 14 + 75 + true + + + + new + + + true + + + + + 120 @@ -3085,157 +4051,147 @@ QScrollBar::up-arrow:vertical { color: rgb(239, 151, 0); - LBelegung10 + LBelegung11 - - + + - 250 + 120 29 - 1000 + 16777215 100 - 14 - 75 - true + 12 - - 50 + + color: rgb(239, 151, 0); - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + LBelegung13 - - + + - 250 + 120 29 - 1000 + 16777215 100 - 14 - 75 - true + 12 - - 70 + + color: rgb(239, 151, 0); - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + LBelegung12 - - + + - 250 + 120 29 - 1000 + 16777215 100 - 14 - 75 - true + 12 - - 90 + + color: rgb(239, 151, 0); - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + LBelegung15 - - + + - 250 + 120 29 - 1000 + 16777215 100 - 14 - 75 - true + 12 - - 67 + + color: rgb(239, 151, 0); - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + LBelegung14 - - + + - 250 + 120 29 - 1000 + 16777215 100 - 14 - 75 - true + 12 - - 100 + + color: rgb(239, 151, 0); - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + LBelegung16 - - + + 250 @@ -3256,15 +4212,15 @@ QScrollBar::up-arrow:vertical { - 95 + 10 Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + 250 @@ -3292,8 +4248,8 @@ QScrollBar::up-arrow:vertical { - - + + 250 @@ -3314,15 +4270,15 @@ QScrollBar::up-arrow:vertical { - 24 + 10 Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + 250 @@ -3343,87 +4299,73 @@ QScrollBar::up-arrow:vertical { - 99 + 10 Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - 103 + 250 29 - 300 + 1000 100 14 + 75 + true - - 11 - - - - - - - - 103 - 29 - - - - - 300 - 100 - - - - - 14 - + + 10 - - 11 + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - 103 + 250 29 - 300 + 1000 100 14 + 75 + true - - 11 + + 10 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + 103 @@ -3446,8 +4388,8 @@ QScrollBar::up-arrow:vertical { - - + + 103 @@ -3470,8 +4412,8 @@ QScrollBar::up-arrow:vertical { - - + + 103 @@ -3494,8 +4436,8 @@ QScrollBar::up-arrow:vertical { - - + + 103 @@ -3518,8 +4460,8 @@ QScrollBar::up-arrow:vertical { - - + + 103 @@ -3542,8 +4484,8 @@ QScrollBar::up-arrow:vertical { - - + + 103 @@ -3566,104 +4508,8 @@ QScrollBar::up-arrow:vertical { - - - - - 0 - 29 - - - - - 16777215 - 100 - - - - - 22 - 75 - true - - - - color: rgb(239, 151, 0); - - - 4 - - - Qt::AlignCenter - - - - - - - - 0 - 29 - - - - - 16777215 - 100 - - - - - 22 - 75 - true - - - - color: rgb(239, 151, 0); - - - 2 - - - Qt::AlignCenter - - - - - - - - 0 - 29 - - - - - 16777215 - 100 - - - - - 22 - 75 - true - - - - color: rgb(239, 151, 0); - - - 3 - - - Qt::AlignCenter - - - - - + + 0 @@ -3687,15 +4533,15 @@ QScrollBar::up-arrow:vertical { color: rgb(239, 151, 0); - 7 + 11 Qt::AlignCenter - - + + 0 @@ -3719,15 +4565,15 @@ QScrollBar::up-arrow:vertical { color: rgb(239, 151, 0); - 6 + 12 Qt::AlignCenter - - + + 0 @@ -3751,15 +4597,15 @@ QScrollBar::up-arrow:vertical { color: rgb(239, 151, 0); - 5 + 13 Qt::AlignCenter - - + + 0 @@ -3783,15 +4629,15 @@ QScrollBar::up-arrow:vertical { color: rgb(239, 151, 0); - 9 + 14 Qt::AlignCenter - - + + 0 @@ -3815,15 +4661,15 @@ QScrollBar::up-arrow:vertical { color: rgb(239, 151, 0); - 8 + 15 Qt::AlignCenter - - + + 0 @@ -3847,7 +4693,7 @@ QScrollBar::up-arrow:vertical { color: rgb(239, 151, 0); - 10 + 16 Qt::AlignCenter diff --git a/src/ui_elements/bottlewindow.py b/src/ui_elements/bottlewindow.py index 786db222..17382fa9 100644 --- a/src/ui_elements/bottlewindow.py +++ b/src/ui_elements/bottlewindow.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '.\ui_elements\bottlewindow.ui' +# Form implementation generated from reading ui file '.\bottlewindow.ui' # -# Created by: PyQt5 UI code generator 5.15.4 +# Created by: PyQt5 UI code generator 5.15.6 # # WARNING: Any manual changes made to this file will be lost when pyuic5 is # run again. Do not edit this file unless you know what you are doing. @@ -14,14 +14,14 @@ class Ui_Bottlewindow(object): def setupUi(self, Bottlewindow): Bottlewindow.setObjectName("Bottlewindow") - Bottlewindow.resize(800, 480) + Bottlewindow.resize(800, 700) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(Bottlewindow.sizePolicy().hasHeightForWidth()) Bottlewindow.setSizePolicy(sizePolicy) Bottlewindow.setMinimumSize(QtCore.QSize(800, 480)) - Bottlewindow.setMaximumSize(QtCore.QSize(800, 480)) + Bottlewindow.setMaximumSize(QtCore.QSize(800, 700)) Bottlewindow.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor)) Bottlewindow.setStyleSheet("QWidget\n" "{\n" @@ -69,7 +69,7 @@ def setupUi(self, Bottlewindow): "#Labbruch {\n" " color: rgb(239, 151, 0);\n" "}\n" -"#LName1, #LName2, #LName3, #LName4, #LName5, #LName6, #LName7, #LName8, #LName9, #LName10 {\n" +"#LName1, #LName2, #LName3, #LName4, #LName5, #LName6, #LName7, #LName8, #LName9, #LName10, #LName11, #LName12, #LName13, #LName14, #LName15, #LName16 {\n" " color: rgb(239, 151, 0);\n" "}\n" "\n" @@ -97,192 +97,44 @@ def setupUi(self, Bottlewindow): self.verticalLayout.setObjectName("verticalLayout") self.gridLayout = QtWidgets.QGridLayout() self.gridLayout.setObjectName("gridLayout") - self.LAmount1 = QtWidgets.QLabel(self.centralwidget) - self.LAmount1.setMinimumSize(QtCore.QSize(65, 0)) - self.LAmount1.setMaximumSize(QtCore.QSize(190, 200)) - font = QtGui.QFont() - font.setPointSize(16) - font.setBold(True) - font.setWeight(75) - self.LAmount1.setFont(font) - self.LAmount1.setLineWidth(1) - self.LAmount1.setAlignment(QtCore.Qt.AlignCenter) - self.LAmount1.setObjectName("LAmount1") - self.gridLayout.addWidget(self.LAmount1, 1, 2, 1, 1) - self.LName6 = QtWidgets.QLabel(self.centralwidget) - self.LName6.setMinimumSize(QtCore.QSize(400, 0)) - self.LName6.setMaximumSize(QtCore.QSize(1100, 200)) - font = QtGui.QFont() - font.setPointSize(16) - self.LName6.setFont(font) - self.LName6.setObjectName("LName6") - self.gridLayout.addWidget(self.LName6, 6, 0, 1, 1) - self.LName9 = QtWidgets.QLabel(self.centralwidget) - self.LName9.setMinimumSize(QtCore.QSize(400, 0)) - self.LName9.setMaximumSize(QtCore.QSize(1100, 200)) - font = QtGui.QFont() - font.setPointSize(16) - self.LName9.setFont(font) - self.LName9.setObjectName("LName9") - self.gridLayout.addWidget(self.LName9, 9, 0, 1, 1) - self.LName7 = QtWidgets.QLabel(self.centralwidget) - self.LName7.setMinimumSize(QtCore.QSize(400, 0)) - self.LName7.setMaximumSize(QtCore.QSize(1100, 200)) - font = QtGui.QFont() - font.setPointSize(16) - self.LName7.setFont(font) - self.LName7.setObjectName("LName7") - self.gridLayout.addWidget(self.LName7, 7, 0, 1, 1) - self.LName8 = QtWidgets.QLabel(self.centralwidget) - self.LName8.setMinimumSize(QtCore.QSize(400, 0)) - self.LName8.setMaximumSize(QtCore.QSize(1100, 200)) - font = QtGui.QFont() - font.setPointSize(16) - self.LName8.setFont(font) - self.LName8.setObjectName("LName8") - self.gridLayout.addWidget(self.LName8, 8, 0, 1, 1) - self.LName3 = QtWidgets.QLabel(self.centralwidget) - self.LName3.setMinimumSize(QtCore.QSize(400, 0)) - self.LName3.setMaximumSize(QtCore.QSize(1100, 200)) - font = QtGui.QFont() - font.setPointSize(16) - self.LName3.setFont(font) - self.LName3.setObjectName("LName3") - self.gridLayout.addWidget(self.LName3, 3, 0, 1, 1) - self.PBMminus2 = QtWidgets.QPushButton(self.centralwidget) - self.PBMminus2.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMminus2.setMaximumSize(QtCore.QSize(400, 200)) - font = QtGui.QFont() - font.setPointSize(18) - font.setBold(True) - font.setWeight(75) - self.PBMminus2.setFont(font) - self.PBMminus2.setObjectName("PBMminus2") - self.gridLayout.addWidget(self.PBMminus2, 2, 1, 1, 1) - self.PBMplus1 = QtWidgets.QPushButton(self.centralwidget) - self.PBMplus1.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMplus1.setMaximumSize(QtCore.QSize(400, 200)) - font = QtGui.QFont() - font.setPointSize(18) - font.setBold(True) - font.setWeight(75) - self.PBMplus1.setFont(font) - self.PBMplus1.setObjectName("PBMplus1") - self.gridLayout.addWidget(self.PBMplus1, 1, 3, 1, 1) - self.LName2 = QtWidgets.QLabel(self.centralwidget) - self.LName2.setMinimumSize(QtCore.QSize(400, 0)) - self.LName2.setMaximumSize(QtCore.QSize(1100, 200)) - font = QtGui.QFont() - font.setPointSize(16) - self.LName2.setFont(font) - self.LName2.setObjectName("LName2") - self.gridLayout.addWidget(self.LName2, 2, 0, 1, 1) - self.LName5 = QtWidgets.QLabel(self.centralwidget) - self.LName5.setMinimumSize(QtCore.QSize(400, 0)) - self.LName5.setMaximumSize(QtCore.QSize(1100, 200)) - font = QtGui.QFont() - font.setPointSize(16) - self.LName5.setFont(font) - self.LName5.setObjectName("LName5") - self.gridLayout.addWidget(self.LName5, 5, 0, 1, 1) - self.LName4 = QtWidgets.QLabel(self.centralwidget) - self.LName4.setMinimumSize(QtCore.QSize(400, 0)) - self.LName4.setMaximumSize(QtCore.QSize(1100, 200)) - font = QtGui.QFont() - font.setPointSize(16) - self.LName4.setFont(font) - self.LName4.setObjectName("LName4") - self.gridLayout.addWidget(self.LName4, 4, 0, 1, 1) - self.LName10 = QtWidgets.QLabel(self.centralwidget) - self.LName10.setMinimumSize(QtCore.QSize(400, 0)) - self.LName10.setMaximumSize(QtCore.QSize(1100, 200)) - font = QtGui.QFont() - font.setPointSize(16) - self.LName10.setFont(font) - self.LName10.setObjectName("LName10") - self.gridLayout.addWidget(self.LName10, 10, 0, 1, 1) - self.LName1 = QtWidgets.QLabel(self.centralwidget) - self.LName1.setMinimumSize(QtCore.QSize(400, 0)) - self.LName1.setMaximumSize(QtCore.QSize(1100, 200)) - font = QtGui.QFont() - font.setPointSize(16) - self.LName1.setFont(font) - self.LName1.setObjectName("LName1") - self.gridLayout.addWidget(self.LName1, 1, 0, 1, 1) - self.PBMminus1 = QtWidgets.QPushButton(self.centralwidget) - self.PBMminus1.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMminus1.setMaximumSize(QtCore.QSize(400, 200)) - font = QtGui.QFont() - font.setPointSize(18) - font.setBold(True) - font.setWeight(75) - self.PBMminus1.setFont(font) - self.PBMminus1.setObjectName("PBMminus1") - self.gridLayout.addWidget(self.PBMminus1, 1, 1, 1, 1) - self.PBMminus4 = QtWidgets.QPushButton(self.centralwidget) - self.PBMminus4.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMminus4.setMaximumSize(QtCore.QSize(400, 200)) - font = QtGui.QFont() - font.setPointSize(18) - font.setBold(True) - font.setWeight(75) - self.PBMminus4.setFont(font) - self.PBMminus4.setObjectName("PBMminus4") - self.gridLayout.addWidget(self.PBMminus4, 4, 1, 1, 1) - self.PBMminus3 = QtWidgets.QPushButton(self.centralwidget) - self.PBMminus3.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMminus3.setMaximumSize(QtCore.QSize(400, 200)) + self.PBAbbrechen = QtWidgets.QPushButton(self.centralwidget) + self.PBAbbrechen.setMinimumSize(QtCore.QSize(0, 50)) + self.PBAbbrechen.setMaximumSize(QtCore.QSize(1000, 300)) font = QtGui.QFont() - font.setPointSize(18) + font.setPointSize(20) font.setBold(True) font.setWeight(75) - self.PBMminus3.setFont(font) - self.PBMminus3.setObjectName("PBMminus3") - self.gridLayout.addWidget(self.PBMminus3, 3, 1, 1, 1) - self.LAmount9 = QtWidgets.QLabel(self.centralwidget) - self.LAmount9.setMinimumSize(QtCore.QSize(65, 0)) - self.LAmount9.setMaximumSize(QtCore.QSize(190, 200)) + self.PBAbbrechen.setFont(font) + self.PBAbbrechen.setObjectName("PBAbbrechen") + self.gridLayout.addWidget(self.PBAbbrechen, 17, 1, 1, 3) + self.PBEintragen = QtWidgets.QPushButton(self.centralwidget) + self.PBEintragen.setMinimumSize(QtCore.QSize(0, 50)) + self.PBEintragen.setMaximumSize(QtCore.QSize(1100, 300)) font = QtGui.QFont() - font.setPointSize(16) + font.setPointSize(20) font.setBold(True) font.setWeight(75) - self.LAmount9.setFont(font) - self.LAmount9.setLineWidth(1) - self.LAmount9.setAlignment(QtCore.Qt.AlignCenter) - self.LAmount9.setObjectName("LAmount9") - self.gridLayout.addWidget(self.LAmount9, 9, 2, 1, 1) - self.PBMminus5 = QtWidgets.QPushButton(self.centralwidget) - self.PBMminus5.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMminus5.setMaximumSize(QtCore.QSize(400, 200)) + self.PBEintragen.setFont(font) + self.PBEintragen.setObjectName("PBEintragen") + self.gridLayout.addWidget(self.PBEintragen, 17, 0, 1, 1) + self.PBMplus10 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus10.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus10.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMminus5.setFont(font) - self.PBMminus5.setObjectName("PBMminus5") - self.gridLayout.addWidget(self.PBMminus5, 5, 1, 1, 1) - self.LAmount4 = QtWidgets.QLabel(self.centralwidget) - self.LAmount4.setMinimumSize(QtCore.QSize(65, 0)) - self.LAmount4.setMaximumSize(QtCore.QSize(190, 200)) - font = QtGui.QFont() - font.setPointSize(16) - font.setBold(True) - font.setWeight(75) - self.LAmount4.setFont(font) - self.LAmount4.setLineWidth(1) - self.LAmount4.setAlignment(QtCore.Qt.AlignCenter) - self.LAmount4.setObjectName("LAmount4") - self.gridLayout.addWidget(self.LAmount4, 4, 2, 1, 1) - self.PBMminus10 = QtWidgets.QPushButton(self.centralwidget) - self.PBMminus10.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMminus10.setMaximumSize(QtCore.QSize(400, 200)) + self.PBMplus10.setFont(font) + self.PBMplus10.setObjectName("PBMplus10") + self.gridLayout.addWidget(self.PBMplus10, 10, 3, 1, 1) + self.LHeader = QtWidgets.QLabel(self.centralwidget) + self.LHeader.setMinimumSize(QtCore.QSize(0, 35)) font = QtGui.QFont() - font.setPointSize(18) - font.setBold(True) - font.setWeight(75) - self.PBMminus10.setFont(font) - self.PBMminus10.setObjectName("PBMminus10") - self.gridLayout.addWidget(self.PBMminus10, 10, 1, 1, 1) + font.setPointSize(14) + self.LHeader.setFont(font) + self.LHeader.setAlignment(QtCore.Qt.AlignCenter) + self.LHeader.setObjectName("LHeader") + self.gridLayout.addWidget(self.LHeader, 0, 0, 1, 4) self.LAmount2 = QtWidgets.QLabel(self.centralwidget) self.LAmount2.setMinimumSize(QtCore.QSize(65, 0)) self.LAmount2.setMaximumSize(QtCore.QSize(190, 200)) @@ -365,46 +217,150 @@ def setupUi(self, Bottlewindow): self.LAmount8.setAlignment(QtCore.Qt.AlignCenter) self.LAmount8.setObjectName("LAmount8") self.gridLayout.addWidget(self.LAmount8, 8, 2, 1, 1) - self.PBMminus8 = QtWidgets.QPushButton(self.centralwidget) - self.PBMminus8.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMminus8.setMaximumSize(QtCore.QSize(400, 200)) + self.PBMminus10 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus10.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus10.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMminus8.setFont(font) - self.PBMminus8.setObjectName("PBMminus8") - self.gridLayout.addWidget(self.PBMminus8, 8, 1, 1, 1) - self.PBMminus7 = QtWidgets.QPushButton(self.centralwidget) - self.PBMminus7.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMminus7.setMaximumSize(QtCore.QSize(400, 200)) + self.PBMminus10.setFont(font) + self.PBMminus10.setObjectName("PBMminus10") + self.gridLayout.addWidget(self.PBMminus10, 10, 1, 1, 1) + self.LAmount4 = QtWidgets.QLabel(self.centralwidget) + self.LAmount4.setMinimumSize(QtCore.QSize(65, 0)) + self.LAmount4.setMaximumSize(QtCore.QSize(190, 200)) + font = QtGui.QFont() + font.setPointSize(16) + font.setBold(True) + font.setWeight(75) + self.LAmount4.setFont(font) + self.LAmount4.setLineWidth(1) + self.LAmount4.setAlignment(QtCore.Qt.AlignCenter) + self.LAmount4.setObjectName("LAmount4") + self.gridLayout.addWidget(self.LAmount4, 4, 2, 1, 1) + self.PBMplus5 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus5.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus5.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMminus7.setFont(font) - self.PBMminus7.setObjectName("PBMminus7") - self.gridLayout.addWidget(self.PBMminus7, 7, 1, 1, 1) - self.PBMplus7 = QtWidgets.QPushButton(self.centralwidget) - self.PBMplus7.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMplus7.setMaximumSize(QtCore.QSize(400, 200)) + self.PBMplus5.setFont(font) + self.PBMplus5.setObjectName("PBMplus5") + self.gridLayout.addWidget(self.PBMplus5, 5, 3, 1, 1) + self.PBMplus4 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus4.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus4.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMplus7.setFont(font) - self.PBMplus7.setObjectName("PBMplus7") - self.gridLayout.addWidget(self.PBMplus7, 7, 3, 1, 1) - self.PBMplus2 = QtWidgets.QPushButton(self.centralwidget) - self.PBMplus2.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMplus2.setMaximumSize(QtCore.QSize(400, 200)) + self.PBMplus4.setFont(font) + self.PBMplus4.setObjectName("PBMplus4") + self.gridLayout.addWidget(self.PBMplus4, 4, 3, 1, 1) + self.PBMplus9 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus9.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus9.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMplus2.setFont(font) - self.PBMplus2.setObjectName("PBMplus2") - self.gridLayout.addWidget(self.PBMplus2, 2, 3, 1, 1) + self.PBMplus9.setFont(font) + self.PBMplus9.setObjectName("PBMplus9") + self.gridLayout.addWidget(self.PBMplus9, 9, 3, 1, 1) + self.PBMplus6 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus6.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus6.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMplus6.setFont(font) + self.PBMplus6.setObjectName("PBMplus6") + self.gridLayout.addWidget(self.PBMplus6, 6, 3, 1, 1) + self.PBMplus8 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus8.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus8.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMplus8.setFont(font) + self.PBMplus8.setObjectName("PBMplus8") + self.gridLayout.addWidget(self.PBMplus8, 8, 3, 1, 1) + self.LAmount7 = QtWidgets.QLabel(self.centralwidget) + self.LAmount7.setMinimumSize(QtCore.QSize(65, 0)) + self.LAmount7.setMaximumSize(QtCore.QSize(190, 200)) + font = QtGui.QFont() + font.setPointSize(16) + font.setBold(True) + font.setWeight(75) + self.LAmount7.setFont(font) + self.LAmount7.setLineWidth(1) + self.LAmount7.setAlignment(QtCore.Qt.AlignCenter) + self.LAmount7.setObjectName("LAmount7") + self.gridLayout.addWidget(self.LAmount7, 7, 2, 1, 1) + self.PBMminus8 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus8.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus8.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMminus8.setFont(font) + self.PBMminus8.setObjectName("PBMminus8") + self.gridLayout.addWidget(self.PBMminus8, 8, 1, 1, 1) + self.LName14 = QtWidgets.QLabel(self.centralwidget) + self.LName14.setMinimumSize(QtCore.QSize(400, 0)) + self.LName14.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName14.setFont(font) + self.LName14.setObjectName("LName14") + self.gridLayout.addWidget(self.LName14, 14, 0, 1, 1) + self.LName15 = QtWidgets.QLabel(self.centralwidget) + self.LName15.setMinimumSize(QtCore.QSize(400, 0)) + self.LName15.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName15.setFont(font) + self.LName15.setObjectName("LName15") + self.gridLayout.addWidget(self.LName15, 15, 0, 1, 1) + self.LName13 = QtWidgets.QLabel(self.centralwidget) + self.LName13.setMinimumSize(QtCore.QSize(400, 0)) + self.LName13.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName13.setFont(font) + self.LName13.setObjectName("LName13") + self.gridLayout.addWidget(self.LName13, 13, 0, 1, 1) + self.LName12 = QtWidgets.QLabel(self.centralwidget) + self.LName12.setMinimumSize(QtCore.QSize(400, 0)) + self.LName12.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName12.setFont(font) + self.LName12.setObjectName("LName12") + self.gridLayout.addWidget(self.LName12, 12, 0, 1, 1) + self.LName11 = QtWidgets.QLabel(self.centralwidget) + self.LName11.setMinimumSize(QtCore.QSize(400, 0)) + self.LName11.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName11.setFont(font) + self.LName11.setObjectName("LName11") + self.gridLayout.addWidget(self.LName11, 11, 0, 1, 1) + self.PBMminus7 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus7.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus7.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMminus7.setFont(font) + self.PBMminus7.setObjectName("PBMminus7") + self.gridLayout.addWidget(self.PBMminus7, 7, 1, 1, 1) self.PBMminus6 = QtWidgets.QPushButton(self.centralwidget) self.PBMminus6.setMinimumSize(QtCore.QSize(60, 18)) self.PBMminus6.setMaximumSize(QtCore.QSize(400, 200)) @@ -415,6 +371,26 @@ def setupUi(self, Bottlewindow): self.PBMminus6.setFont(font) self.PBMminus6.setObjectName("PBMminus6") self.gridLayout.addWidget(self.PBMminus6, 6, 1, 1, 1) + self.PBMplus7 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus7.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus7.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMplus7.setFont(font) + self.PBMplus7.setObjectName("PBMplus7") + self.gridLayout.addWidget(self.PBMplus7, 7, 3, 1, 1) + self.PBMplus2 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus2.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus2.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMplus2.setFont(font) + self.PBMplus2.setObjectName("PBMplus2") + self.gridLayout.addWidget(self.PBMplus2, 2, 3, 1, 1) self.PBMplus3 = QtWidgets.QPushButton(self.centralwidget) self.PBMplus3.setMinimumSize(QtCore.QSize(60, 18)) self.PBMplus3.setMaximumSize(QtCore.QSize(400, 200)) @@ -425,106 +401,370 @@ def setupUi(self, Bottlewindow): self.PBMplus3.setFont(font) self.PBMplus3.setObjectName("PBMplus3") self.gridLayout.addWidget(self.PBMplus3, 3, 3, 1, 1) - self.PBMplus6 = QtWidgets.QPushButton(self.centralwidget) - self.PBMplus6.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMplus6.setMaximumSize(QtCore.QSize(400, 200)) + self.PBMplus1 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus1.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus1.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMplus6.setFont(font) - self.PBMplus6.setObjectName("PBMplus6") - self.gridLayout.addWidget(self.PBMplus6, 6, 3, 1, 1) - self.PBMplus5 = QtWidgets.QPushButton(self.centralwidget) - self.PBMplus5.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMplus5.setMaximumSize(QtCore.QSize(400, 200)) + self.PBMplus1.setFont(font) + self.PBMplus1.setObjectName("PBMplus1") + self.gridLayout.addWidget(self.PBMplus1, 1, 3, 1, 1) + self.PBMminus2 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus2.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus2.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMplus5.setFont(font) - self.PBMplus5.setObjectName("PBMplus5") - self.gridLayout.addWidget(self.PBMplus5, 5, 3, 1, 1) - self.PBMplus4 = QtWidgets.QPushButton(self.centralwidget) - self.PBMplus4.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMplus4.setMaximumSize(QtCore.QSize(400, 200)) + self.PBMminus2.setFont(font) + self.PBMminus2.setObjectName("PBMminus2") + self.gridLayout.addWidget(self.PBMminus2, 2, 1, 1, 1) + self.LName3 = QtWidgets.QLabel(self.centralwidget) + self.LName3.setMinimumSize(QtCore.QSize(400, 0)) + self.LName3.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName3.setFont(font) + self.LName3.setObjectName("LName3") + self.gridLayout.addWidget(self.LName3, 3, 0, 1, 1) + self.LName4 = QtWidgets.QLabel(self.centralwidget) + self.LName4.setMinimumSize(QtCore.QSize(400, 0)) + self.LName4.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName4.setFont(font) + self.LName4.setObjectName("LName4") + self.gridLayout.addWidget(self.LName4, 4, 0, 1, 1) + self.LName2 = QtWidgets.QLabel(self.centralwidget) + self.LName2.setMinimumSize(QtCore.QSize(400, 0)) + self.LName2.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName2.setFont(font) + self.LName2.setObjectName("LName2") + self.gridLayout.addWidget(self.LName2, 2, 0, 1, 1) + self.LName5 = QtWidgets.QLabel(self.centralwidget) + self.LName5.setMinimumSize(QtCore.QSize(400, 0)) + self.LName5.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName5.setFont(font) + self.LName5.setObjectName("LName5") + self.gridLayout.addWidget(self.LName5, 5, 0, 1, 1) + self.PBMminus4 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus4.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus4.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMplus4.setFont(font) - self.PBMplus4.setObjectName("PBMplus4") - self.gridLayout.addWidget(self.PBMplus4, 4, 3, 1, 1) - self.PBMplus9 = QtWidgets.QPushButton(self.centralwidget) - self.PBMplus9.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMplus9.setMaximumSize(QtCore.QSize(400, 200)) + self.PBMminus4.setFont(font) + self.PBMminus4.setObjectName("PBMminus4") + self.gridLayout.addWidget(self.PBMminus4, 4, 1, 1, 1) + self.LName10 = QtWidgets.QLabel(self.centralwidget) + self.LName10.setMinimumSize(QtCore.QSize(400, 0)) + self.LName10.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName10.setFont(font) + self.LName10.setObjectName("LName10") + self.gridLayout.addWidget(self.LName10, 10, 0, 1, 1) + self.PBMminus1 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus1.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus1.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMplus9.setFont(font) - self.PBMplus9.setObjectName("PBMplus9") - self.gridLayout.addWidget(self.PBMplus9, 9, 3, 1, 1) - self.PBMplus8 = QtWidgets.QPushButton(self.centralwidget) - self.PBMplus8.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMplus8.setMaximumSize(QtCore.QSize(400, 200)) + self.PBMminus1.setFont(font) + self.PBMminus1.setObjectName("PBMminus1") + self.gridLayout.addWidget(self.PBMminus1, 1, 1, 1, 1) + self.LName1 = QtWidgets.QLabel(self.centralwidget) + self.LName1.setMinimumSize(QtCore.QSize(400, 0)) + self.LName1.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName1.setFont(font) + self.LName1.setObjectName("LName1") + self.gridLayout.addWidget(self.LName1, 1, 0, 1, 1) + self.LAmount9 = QtWidgets.QLabel(self.centralwidget) + self.LAmount9.setMinimumSize(QtCore.QSize(65, 0)) + self.LAmount9.setMaximumSize(QtCore.QSize(190, 200)) + font = QtGui.QFont() + font.setPointSize(16) + font.setBold(True) + font.setWeight(75) + self.LAmount9.setFont(font) + self.LAmount9.setLineWidth(1) + self.LAmount9.setAlignment(QtCore.Qt.AlignCenter) + self.LAmount9.setObjectName("LAmount9") + self.gridLayout.addWidget(self.LAmount9, 9, 2, 1, 1) + self.PBMminus5 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus5.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus5.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMplus8.setFont(font) - self.PBMplus8.setObjectName("PBMplus8") - self.gridLayout.addWidget(self.PBMplus8, 8, 3, 1, 1) - self.LAmount7 = QtWidgets.QLabel(self.centralwidget) - self.LAmount7.setMinimumSize(QtCore.QSize(65, 0)) - self.LAmount7.setMaximumSize(QtCore.QSize(190, 200)) + self.PBMminus5.setFont(font) + self.PBMminus5.setObjectName("PBMminus5") + self.gridLayout.addWidget(self.PBMminus5, 5, 1, 1, 1) + self.PBMminus3 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus3.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus3.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMminus3.setFont(font) + self.PBMminus3.setObjectName("PBMminus3") + self.gridLayout.addWidget(self.PBMminus3, 3, 1, 1, 1) + self.LAmount1 = QtWidgets.QLabel(self.centralwidget) + self.LAmount1.setMinimumSize(QtCore.QSize(65, 0)) + self.LAmount1.setMaximumSize(QtCore.QSize(190, 200)) font = QtGui.QFont() font.setPointSize(16) font.setBold(True) font.setWeight(75) - self.LAmount7.setFont(font) - self.LAmount7.setLineWidth(1) - self.LAmount7.setAlignment(QtCore.Qt.AlignCenter) - self.LAmount7.setObjectName("LAmount7") - self.gridLayout.addWidget(self.LAmount7, 7, 2, 1, 1) - self.PBMplus10 = QtWidgets.QPushButton(self.centralwidget) - self.PBMplus10.setMinimumSize(QtCore.QSize(60, 18)) - self.PBMplus10.setMaximumSize(QtCore.QSize(400, 200)) + self.LAmount1.setFont(font) + self.LAmount1.setLineWidth(1) + self.LAmount1.setAlignment(QtCore.Qt.AlignCenter) + self.LAmount1.setObjectName("LAmount1") + self.gridLayout.addWidget(self.LAmount1, 1, 2, 1, 1) + self.LName6 = QtWidgets.QLabel(self.centralwidget) + self.LName6.setMinimumSize(QtCore.QSize(400, 0)) + self.LName6.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName6.setFont(font) + self.LName6.setObjectName("LName6") + self.gridLayout.addWidget(self.LName6, 6, 0, 1, 1) + self.LName9 = QtWidgets.QLabel(self.centralwidget) + self.LName9.setMinimumSize(QtCore.QSize(400, 0)) + self.LName9.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName9.setFont(font) + self.LName9.setObjectName("LName9") + self.gridLayout.addWidget(self.LName9, 9, 0, 1, 1) + self.LName7 = QtWidgets.QLabel(self.centralwidget) + self.LName7.setMinimumSize(QtCore.QSize(400, 0)) + self.LName7.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName7.setFont(font) + self.LName7.setObjectName("LName7") + self.gridLayout.addWidget(self.LName7, 7, 0, 1, 1) + self.LName8 = QtWidgets.QLabel(self.centralwidget) + self.LName8.setMinimumSize(QtCore.QSize(400, 0)) + self.LName8.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName8.setFont(font) + self.LName8.setObjectName("LName8") + self.gridLayout.addWidget(self.LName8, 8, 0, 1, 1) + self.LName16 = QtWidgets.QLabel(self.centralwidget) + self.LName16.setMinimumSize(QtCore.QSize(400, 0)) + self.LName16.setMaximumSize(QtCore.QSize(1100, 200)) + font = QtGui.QFont() + font.setPointSize(16) + self.LName16.setFont(font) + self.LName16.setObjectName("LName16") + self.gridLayout.addWidget(self.LName16, 16, 0, 1, 1) + self.PBMminus11 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus11.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus11.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBMplus10.setFont(font) - self.PBMplus10.setObjectName("PBMplus10") - self.gridLayout.addWidget(self.PBMplus10, 10, 3, 1, 1) - self.LHeader = QtWidgets.QLabel(self.centralwidget) - self.LHeader.setMinimumSize(QtCore.QSize(0, 35)) + self.PBMminus11.setFont(font) + self.PBMminus11.setObjectName("PBMminus11") + self.gridLayout.addWidget(self.PBMminus11, 11, 1, 1, 1) + self.PBMminus12 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus12.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus12.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() - font.setPointSize(14) - self.LHeader.setFont(font) - self.LHeader.setAlignment(QtCore.Qt.AlignCenter) - self.LHeader.setObjectName("LHeader") - self.gridLayout.addWidget(self.LHeader, 0, 0, 1, 4) - self.PBEintragen = QtWidgets.QPushButton(self.centralwidget) - self.PBEintragen.setMinimumSize(QtCore.QSize(0, 50)) - self.PBEintragen.setMaximumSize(QtCore.QSize(1100, 300)) + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMminus12.setFont(font) + self.PBMminus12.setObjectName("PBMminus12") + self.gridLayout.addWidget(self.PBMminus12, 12, 1, 1, 1) + self.PBMminus13 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus13.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus13.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() - font.setPointSize(20) + font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBEintragen.setFont(font) - self.PBEintragen.setObjectName("PBEintragen") - self.gridLayout.addWidget(self.PBEintragen, 11, 0, 1, 1) - self.PBAbbrechen = QtWidgets.QPushButton(self.centralwidget) - self.PBAbbrechen.setMinimumSize(QtCore.QSize(0, 50)) - self.PBAbbrechen.setMaximumSize(QtCore.QSize(1000, 300)) + self.PBMminus13.setFont(font) + self.PBMminus13.setObjectName("PBMminus13") + self.gridLayout.addWidget(self.PBMminus13, 13, 1, 1, 1) + self.PBMminus14 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus14.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus14.setMaximumSize(QtCore.QSize(400, 200)) font = QtGui.QFont() - font.setPointSize(20) + font.setPointSize(18) font.setBold(True) font.setWeight(75) - self.PBAbbrechen.setFont(font) - self.PBAbbrechen.setObjectName("PBAbbrechen") - self.gridLayout.addWidget(self.PBAbbrechen, 11, 1, 1, 3) + self.PBMminus14.setFont(font) + self.PBMminus14.setObjectName("PBMminus14") + self.gridLayout.addWidget(self.PBMminus14, 14, 1, 1, 1) + self.PBMminus15 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus15.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus15.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMminus15.setFont(font) + self.PBMminus15.setObjectName("PBMminus15") + self.gridLayout.addWidget(self.PBMminus15, 15, 1, 1, 1) + self.PBMminus16 = QtWidgets.QPushButton(self.centralwidget) + self.PBMminus16.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMminus16.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMminus16.setFont(font) + self.PBMminus16.setObjectName("PBMminus16") + self.gridLayout.addWidget(self.PBMminus16, 16, 1, 1, 1) + self.PBMplus11 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus11.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus11.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMplus11.setFont(font) + self.PBMplus11.setObjectName("PBMplus11") + self.gridLayout.addWidget(self.PBMplus11, 11, 3, 1, 1) + self.LAmount11 = QtWidgets.QLabel(self.centralwidget) + self.LAmount11.setMinimumSize(QtCore.QSize(65, 0)) + self.LAmount11.setMaximumSize(QtCore.QSize(190, 200)) + font = QtGui.QFont() + font.setPointSize(16) + font.setBold(True) + font.setWeight(75) + self.LAmount11.setFont(font) + self.LAmount11.setLineWidth(1) + self.LAmount11.setAlignment(QtCore.Qt.AlignCenter) + self.LAmount11.setObjectName("LAmount11") + self.gridLayout.addWidget(self.LAmount11, 11, 2, 1, 1) + self.LAmount12 = QtWidgets.QLabel(self.centralwidget) + self.LAmount12.setMinimumSize(QtCore.QSize(65, 0)) + self.LAmount12.setMaximumSize(QtCore.QSize(190, 200)) + font = QtGui.QFont() + font.setPointSize(16) + font.setBold(True) + font.setWeight(75) + self.LAmount12.setFont(font) + self.LAmount12.setLineWidth(1) + self.LAmount12.setAlignment(QtCore.Qt.AlignCenter) + self.LAmount12.setObjectName("LAmount12") + self.gridLayout.addWidget(self.LAmount12, 12, 2, 1, 1) + self.LAmount13 = QtWidgets.QLabel(self.centralwidget) + self.LAmount13.setMinimumSize(QtCore.QSize(65, 0)) + self.LAmount13.setMaximumSize(QtCore.QSize(190, 200)) + font = QtGui.QFont() + font.setPointSize(16) + font.setBold(True) + font.setWeight(75) + self.LAmount13.setFont(font) + self.LAmount13.setLineWidth(1) + self.LAmount13.setAlignment(QtCore.Qt.AlignCenter) + self.LAmount13.setObjectName("LAmount13") + self.gridLayout.addWidget(self.LAmount13, 13, 2, 1, 1) + self.LAmount14 = QtWidgets.QLabel(self.centralwidget) + self.LAmount14.setMinimumSize(QtCore.QSize(65, 0)) + self.LAmount14.setMaximumSize(QtCore.QSize(190, 200)) + font = QtGui.QFont() + font.setPointSize(16) + font.setBold(True) + font.setWeight(75) + self.LAmount14.setFont(font) + self.LAmount14.setLineWidth(1) + self.LAmount14.setAlignment(QtCore.Qt.AlignCenter) + self.LAmount14.setObjectName("LAmount14") + self.gridLayout.addWidget(self.LAmount14, 14, 2, 1, 1) + self.LAmount15 = QtWidgets.QLabel(self.centralwidget) + self.LAmount15.setMinimumSize(QtCore.QSize(65, 0)) + self.LAmount15.setMaximumSize(QtCore.QSize(190, 200)) + font = QtGui.QFont() + font.setPointSize(16) + font.setBold(True) + font.setWeight(75) + self.LAmount15.setFont(font) + self.LAmount15.setLineWidth(1) + self.LAmount15.setAlignment(QtCore.Qt.AlignCenter) + self.LAmount15.setObjectName("LAmount15") + self.gridLayout.addWidget(self.LAmount15, 15, 2, 1, 1) + self.LAmount16 = QtWidgets.QLabel(self.centralwidget) + self.LAmount16.setMinimumSize(QtCore.QSize(65, 0)) + self.LAmount16.setMaximumSize(QtCore.QSize(190, 200)) + font = QtGui.QFont() + font.setPointSize(16) + font.setBold(True) + font.setWeight(75) + self.LAmount16.setFont(font) + self.LAmount16.setLineWidth(1) + self.LAmount16.setAlignment(QtCore.Qt.AlignCenter) + self.LAmount16.setObjectName("LAmount16") + self.gridLayout.addWidget(self.LAmount16, 16, 2, 1, 1) + self.PBMplus12 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus12.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus12.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMplus12.setFont(font) + self.PBMplus12.setObjectName("PBMplus12") + self.gridLayout.addWidget(self.PBMplus12, 12, 3, 1, 1) + self.PBMplus13 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus13.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus13.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMplus13.setFont(font) + self.PBMplus13.setObjectName("PBMplus13") + self.gridLayout.addWidget(self.PBMplus13, 13, 3, 1, 1) + self.PBMplus14 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus14.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus14.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMplus14.setFont(font) + self.PBMplus14.setObjectName("PBMplus14") + self.gridLayout.addWidget(self.PBMplus14, 14, 3, 1, 1) + self.PBMplus15 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus15.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus15.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMplus15.setFont(font) + self.PBMplus15.setObjectName("PBMplus15") + self.gridLayout.addWidget(self.PBMplus15, 15, 3, 1, 1) + self.PBMplus16 = QtWidgets.QPushButton(self.centralwidget) + self.PBMplus16.setMinimumSize(QtCore.QSize(60, 18)) + self.PBMplus16.setMaximumSize(QtCore.QSize(400, 200)) + font = QtGui.QFont() + font.setPointSize(18) + font.setBold(True) + font.setWeight(75) + self.PBMplus16.setFont(font) + self.PBMplus16.setObjectName("PBMplus16") + self.gridLayout.addWidget(self.PBMplus16, 16, 3, 1, 1) self.verticalLayout.addLayout(self.gridLayout) Bottlewindow.setCentralWidget(self.centralwidget) @@ -534,26 +774,10 @@ def setupUi(self, Bottlewindow): def retranslateUi(self, Bottlewindow): _translate = QtCore.QCoreApplication.translate Bottlewindow.setWindowTitle(_translate("Bottlewindow", "~~ Füllstand der Flaschen auswählen ~~")) - self.LAmount1.setText(_translate("Bottlewindow", "200")) - self.LName6.setText(_translate("Bottlewindow", "TextLabel")) - self.LName9.setText(_translate("Bottlewindow", "TextLabel")) - self.LName7.setText(_translate("Bottlewindow", "TextLabel")) - self.LName8.setText(_translate("Bottlewindow", "TextLabel")) - self.LName3.setText(_translate("Bottlewindow", "TextLabel")) - self.PBMminus2.setText(_translate("Bottlewindow", "-")) - self.PBMplus1.setText(_translate("Bottlewindow", "+")) - self.LName2.setText(_translate("Bottlewindow", "TextLabel")) - self.LName5.setText(_translate("Bottlewindow", "TextLabel")) - self.LName4.setText(_translate("Bottlewindow", "TextLabel")) - self.LName10.setText(_translate("Bottlewindow", "TextLabel")) - self.LName1.setText(_translate("Bottlewindow", "TextLabel")) - self.PBMminus1.setText(_translate("Bottlewindow", "-")) - self.PBMminus4.setText(_translate("Bottlewindow", "-")) - self.PBMminus3.setText(_translate("Bottlewindow", "-")) - self.LAmount9.setText(_translate("Bottlewindow", "200")) - self.PBMminus5.setText(_translate("Bottlewindow", "-")) - self.LAmount4.setText(_translate("Bottlewindow", "200")) - self.PBMminus10.setText(_translate("Bottlewindow", "-")) + self.PBAbbrechen.setText(_translate("Bottlewindow", "Abbrechen")) + self.PBEintragen.setText(_translate("Bottlewindow", "Eintragen")) + self.PBMplus10.setText(_translate("Bottlewindow", "+")) + self.LHeader.setText(_translate("Bottlewindow", "Füllstand der Flaschen auswählen/ändern")) self.LAmount2.setText(_translate("Bottlewindow", "200")) self.PBMminus9.setText(_translate("Bottlewindow", "-")) self.LAmount3.setText(_translate("Bottlewindow", "200")) @@ -561,22 +785,62 @@ def retranslateUi(self, Bottlewindow): self.LAmount6.setText(_translate("Bottlewindow", "200")) self.LAmount5.setText(_translate("Bottlewindow", "200")) self.LAmount8.setText(_translate("Bottlewindow", "200")) - self.PBMminus8.setText(_translate("Bottlewindow", "-")) - self.PBMminus7.setText(_translate("Bottlewindow", "-")) - self.PBMplus7.setText(_translate("Bottlewindow", "+")) - self.PBMplus2.setText(_translate("Bottlewindow", "+")) - self.PBMminus6.setText(_translate("Bottlewindow", "-")) - self.PBMplus3.setText(_translate("Bottlewindow", "+")) - self.PBMplus6.setText(_translate("Bottlewindow", "+")) + self.PBMminus10.setText(_translate("Bottlewindow", "-")) + self.LAmount4.setText(_translate("Bottlewindow", "200")) self.PBMplus5.setText(_translate("Bottlewindow", "+")) self.PBMplus4.setText(_translate("Bottlewindow", "+")) self.PBMplus9.setText(_translate("Bottlewindow", "+")) + self.PBMplus6.setText(_translate("Bottlewindow", "+")) self.PBMplus8.setText(_translate("Bottlewindow", "+")) self.LAmount7.setText(_translate("Bottlewindow", "200")) - self.PBMplus10.setText(_translate("Bottlewindow", "+")) - self.LHeader.setText(_translate("Bottlewindow", "Füllstand der Flaschen auswählen/ändern")) - self.PBEintragen.setText(_translate("Bottlewindow", "Eintragen")) - self.PBAbbrechen.setText(_translate("Bottlewindow", "Abbrechen")) + self.PBMminus8.setText(_translate("Bottlewindow", "-")) + self.LName14.setText(_translate("Bottlewindow", "TextLabel")) + self.LName15.setText(_translate("Bottlewindow", "TextLabel")) + self.LName13.setText(_translate("Bottlewindow", "TextLabel")) + self.LName12.setText(_translate("Bottlewindow", "TextLabel")) + self.LName11.setText(_translate("Bottlewindow", "TextLabel")) + self.PBMminus7.setText(_translate("Bottlewindow", "-")) + self.PBMminus6.setText(_translate("Bottlewindow", "-")) + self.PBMplus7.setText(_translate("Bottlewindow", "+")) + self.PBMplus2.setText(_translate("Bottlewindow", "+")) + self.PBMplus3.setText(_translate("Bottlewindow", "+")) + self.PBMplus1.setText(_translate("Bottlewindow", "+")) + self.PBMminus2.setText(_translate("Bottlewindow", "-")) + self.LName3.setText(_translate("Bottlewindow", "TextLabel")) + self.LName4.setText(_translate("Bottlewindow", "TextLabel")) + self.LName2.setText(_translate("Bottlewindow", "TextLabel")) + self.LName5.setText(_translate("Bottlewindow", "TextLabel")) + self.PBMminus4.setText(_translate("Bottlewindow", "-")) + self.LName10.setText(_translate("Bottlewindow", "TextLabel")) + self.PBMminus1.setText(_translate("Bottlewindow", "-")) + self.LName1.setText(_translate("Bottlewindow", "TextLabel")) + self.LAmount9.setText(_translate("Bottlewindow", "200")) + self.PBMminus5.setText(_translate("Bottlewindow", "-")) + self.PBMminus3.setText(_translate("Bottlewindow", "-")) + self.LAmount1.setText(_translate("Bottlewindow", "200")) + self.LName6.setText(_translate("Bottlewindow", "TextLabel")) + self.LName9.setText(_translate("Bottlewindow", "TextLabel")) + self.LName7.setText(_translate("Bottlewindow", "TextLabel")) + self.LName8.setText(_translate("Bottlewindow", "TextLabel")) + self.LName16.setText(_translate("Bottlewindow", "TextLabel")) + self.PBMminus11.setText(_translate("Bottlewindow", "-")) + self.PBMminus12.setText(_translate("Bottlewindow", "-")) + self.PBMminus13.setText(_translate("Bottlewindow", "-")) + self.PBMminus14.setText(_translate("Bottlewindow", "-")) + self.PBMminus15.setText(_translate("Bottlewindow", "-")) + self.PBMminus16.setText(_translate("Bottlewindow", "-")) + self.PBMplus11.setText(_translate("Bottlewindow", "+")) + self.LAmount11.setText(_translate("Bottlewindow", "200")) + self.LAmount12.setText(_translate("Bottlewindow", "200")) + self.LAmount13.setText(_translate("Bottlewindow", "200")) + self.LAmount14.setText(_translate("Bottlewindow", "200")) + self.LAmount15.setText(_translate("Bottlewindow", "200")) + self.LAmount16.setText(_translate("Bottlewindow", "200")) + self.PBMplus12.setText(_translate("Bottlewindow", "+")) + self.PBMplus13.setText(_translate("Bottlewindow", "+")) + self.PBMplus14.setText(_translate("Bottlewindow", "+")) + self.PBMplus15.setText(_translate("Bottlewindow", "+")) + self.PBMplus16.setText(_translate("Bottlewindow", "+")) if __name__ == "__main__": diff --git a/src/ui_elements/bottlewindow.ui b/src/ui_elements/bottlewindow.ui index 2935e549..0c01cb16 100644 --- a/src/ui_elements/bottlewindow.ui +++ b/src/ui_elements/bottlewindow.ui @@ -7,7 +7,7 @@ 0 0 800 - 480 + 700 @@ -25,7 +25,7 @@ 800 - 480 + 700 @@ -81,7 +81,7 @@ QProgressBar::chunk { #Labbruch { color: rgb(239, 151, 0); } -#LName1, #LName2, #LName3, #LName4, #LName5, #LName6, #LName7, #LName8, #LName9, #LName10 { +#LName1, #LName2, #LName3, #LName4, #LName5, #LName6, #LName7, #LName8, #LName9, #LName10, #LName11, #LName12, #LName13, #LName14, #LName15, #LName16 { color: rgb(239, 151, 0); } @@ -108,40 +108,619 @@ QProgressBar::chunk { - - + + + + + 0 + 50 + + + + + 1000 + 300 + + + + + 20 + 75 + true + + + + Abbrechen + + + + + + + + 0 + 50 + + + + + 1100 + 300 + + + + + 20 + 75 + true + + + + Eintragen + + + + + + + + 60 + 18 + + + + + 400 + 200 + + + + + 18 + 75 + true + + + + + + + + + + + + + 0 + 35 + + + + + 14 + + + + Füllstand der Flaschen auswählen/ändern + + + Qt::AlignCenter + + + + + + + + 65 + 0 + + + + + 190 + 200 + + + + + 16 + 75 + true + + + + 1 + + + 200 + + + Qt::AlignCenter + + + + + + + + 60 + 18 + + + + + 400 + 200 + + + + + 18 + 75 + true + + + + - + + + + + + + + 65 + 0 + + + + + 190 + 200 + + + + + 16 + 75 + true + + + + 1 + + + 200 + + + Qt::AlignCenter + + + + + + + + 65 + 0 + + + + + 190 + 200 + + + + + 16 + 75 + true + + + + 1 + + + 200 + + + Qt::AlignCenter + + + + + + + + 65 + 0 + + + + + 190 + 200 + + + + + 16 + 75 + true + + + + 1 + + + 200 + + + Qt::AlignCenter + + + + + + + + 65 + 0 + + + + + 190 + 200 + + + + + 16 + 75 + true + + + + 1 + + + 200 + + + Qt::AlignCenter + + + + + + + + 65 + 0 + + + + + 190 + 200 + + + + + 16 + 75 + true + + + + 1 + + + 200 + + + Qt::AlignCenter + + + + + + + + 60 + 18 + + + + + 400 + 200 + + + + + 18 + 75 + true + + + + - + + + + + + + + 65 + 0 + + + + + 190 + 200 + + + + + 16 + 75 + true + + + + 1 + + + 200 + + + Qt::AlignCenter + + + + + + + + 60 + 18 + + + + + 400 + 200 + + + + + 18 + 75 + true + + + + + + + + + + + + + 60 + 18 + + + + + 400 + 200 + + + + + 18 + 75 + true + + + + + + + + + + + + + 60 + 18 + + + + + 400 + 200 + + + + + 18 + 75 + true + + + + + + + + + + + + + 60 + 18 + + + + + 400 + 200 + + + + + 18 + 75 + true + + + + + + + + + + + + + 60 + 18 + + + + + 400 + 200 + + + + + 18 + 75 + true + + + + + + + + + + + + + 65 + 0 + + + + + 190 + 200 + + + + + 16 + 75 + true + + + + 1 + + + 200 + + + Qt::AlignCenter + + + + + + + + 60 + 18 + + + + + 400 + 200 + + + + + 18 + 75 + true + + + + - + + + + + + + + 400 + 0 + + + + + 1100 + 200 + + + + + 16 + + + + TextLabel + + + + + - 65 + 400 0 - 190 + 1100 200 16 - 75 - true - - 1 - - 200 - - - Qt::AlignCenter + TextLabel - - + + 400 @@ -164,8 +743,8 @@ QProgressBar::chunk { - - + + 400 @@ -188,8 +767,8 @@ QProgressBar::chunk { - - + + 400 @@ -212,56 +791,112 @@ QProgressBar::chunk { - - + + + + 60 + 18 + + + 400 - 0 + 200 + + + + + 18 + 75 + true + + + + - + + + + + + + + 60 + 18 - 1100 + 400 200 - 16 + 18 + 75 + true - TextLabel + - - - + + + + 60 + 18 + + + 400 - 0 + 200 + + + + + 18 + 75 + true + + + + + + + + + + + + + 60 + 18 - 1100 + 400 200 - 16 + 18 + 75 + true - TextLabel + + - - + + 60 @@ -282,7 +917,7 @@ QProgressBar::chunk { - - + + @@ -312,32 +947,34 @@ QProgressBar::chunk { - - + + - 400 - 0 + 60 + 18 - 1100 + 400 200 - 16 + 18 + 75 + true - TextLabel + - - - + + 400 @@ -384,8 +1021,8 @@ QProgressBar::chunk { - - + + 400 @@ -408,8 +1045,8 @@ QProgressBar::chunk { - - + + 400 @@ -432,8 +1069,8 @@ QProgressBar::chunk { - - + + 60 @@ -458,34 +1095,32 @@ QProgressBar::chunk { - - + + - 60 - 18 + 400 + 0 - 400 + 1100 200 - 18 - 75 - true + 16 - - + TextLabel - - + + 60 @@ -510,6 +1145,30 @@ QProgressBar::chunk { + + + + + 400 + 0 + + + + + 1100 + 200 + + + + + 16 + + + + TextLabel + + + @@ -568,40 +1227,8 @@ QProgressBar::chunk { - - - - - 65 - 0 - - - - - 190 - 200 - - - - - 16 - 75 - true - - - - 1 - - - 200 - - - Qt::AlignCenter - - - - - + + 60 @@ -626,8 +1253,8 @@ QProgressBar::chunk { - - + + 65 @@ -658,194 +1285,154 @@ QProgressBar::chunk { - - + + - 60 - 18 + 400 + 0 - 400 + 1100 200 - 18 - 75 - true + 16 - - + TextLabel - - + + - 65 + 400 0 - 190 + 1100 200 16 - 75 - true - - - - 1 + - 200 - - - Qt::AlignCenter + TextLabel - - + + - 65 + 400 0 - 190 + 1100 200 16 - 75 - true - - 1 - - 200 - - - Qt::AlignCenter + TextLabel - - + + - 65 + 400 0 - 190 + 1100 200 16 - 75 - true - - 1 - - 200 - - - Qt::AlignCenter + TextLabel - - + + - 65 + 400 0 - 190 + 1100 200 16 - 75 - true - - 1 - - 200 - - - Qt::AlignCenter + TextLabel - - + + - 65 - 0 + 60 + 18 - 190 + 400 200 - 16 + 18 75 true - - 1 - - 200 - - - Qt::AlignCenter + - - - + + 60 @@ -870,8 +1457,8 @@ QProgressBar::chunk { - - + + 60 @@ -896,8 +1483,8 @@ QProgressBar::chunk { - - + + 60 @@ -918,12 +1505,12 @@ QProgressBar::chunk { - + + - - - + + 60 @@ -944,12 +1531,12 @@ QProgressBar::chunk { - + + - - - + + 60 @@ -974,8 +1561,8 @@ QProgressBar::chunk { - - + + 60 @@ -1000,138 +1587,168 @@ QProgressBar::chunk { - - + + - 60 - 18 + 65 + 0 - 400 + 190 200 - 18 + 16 75 true + + 1 + - + + 200 + + + Qt::AlignCenter - - + + - 60 - 18 + 65 + 0 - 400 + 190 200 - 18 + 16 75 true + + 1 + - + + 200 + + + Qt::AlignCenter - - + + - 60 - 18 + 65 + 0 - 400 + 190 200 - 18 + 16 75 true + + 1 + - + + 200 + + + Qt::AlignCenter - - + + - 60 - 18 + 65 + 0 - 400 + 190 200 - 18 + 16 75 true + + 1 + - + + 200 + + + Qt::AlignCenter - - + + - 60 - 18 + 65 + 0 - 400 + 190 200 - 18 + 16 75 true + + 1 + - + + 200 + + + Qt::AlignCenter - - + + 65 @@ -1162,8 +1779,8 @@ QProgressBar::chunk { - - + + 60 @@ -1188,76 +1805,107 @@ QProgressBar::chunk { - - + + - 0 - 35 + 60 + 18 + + + + + 400 + 200 - 14 + 18 + 75 + true - Füllstand der Flaschen auswählen/ändern + + - - Qt::AlignCenter + + + + + + + 60 + 18 + + + + + 400 + 200 + + + + + 18 + 75 + true + + + + + - - + + - 0 - 50 + 60 + 18 - 1100 - 300 + 400 + 200 - 20 + 18 75 true - Eintragen + + - - + + - 0 - 50 + 60 + 18 - 1000 - 300 + 400 + 200 - 20 + 18 75 true - Abbrechen + + From 7bcc5611ab7406972e328543a91cdadb826de287 Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Mon, 7 Mar 2022 19:48:49 +0100 Subject: [PATCH 05/11] prepared version --- pyproject.toml | 2 +- src/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e6c6beab..d8846554 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "CocktailBerry" -version = "1.6.0" +version = "1.6.1" description = "A Python and Qt based App for a Cocktail Machine on a Raspberry Pi. Easily serve Cocktails with Raspberry Pi and Python" authors = ["Andre Wohnsland "] readme = "readme.md" diff --git a/src/__init__.py b/src/__init__.py index 50206bd1..4f3d0ec9 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,2 +1,2 @@ -__version__ = "1.6.0" +__version__ = "1.6.1" PROJECT_NAME = "CocktailBerry" From ce838be507e0b7b941b15cae47037858e6a449c1 Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Mon, 7 Mar 2022 20:16:34 +0100 Subject: [PATCH 06/11] Added list len validation --- src/config_manager.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/config_manager.py b/src/config_manager.py index adc95e5d..0c12b902 100644 --- a/src/config_manager.py +++ b/src/config_manager.py @@ -2,12 +2,14 @@ from typing import List import typer import yaml +from src.logger_handler import LoggerHandler from src.models import Ingredient from src import __version__, PROJECT_NAME CONFIG_FILE = Path(__file__).parents[1].absolute() / "custom_config.yaml" +logger = LoggerHandler("config_manager", "production_logs") class ConfigManager: @@ -116,6 +118,18 @@ def __validate_config_list_type(self, configname, configlist): for i, config in enumerate(configlist, 1): if not isinstance(config, datatype): raise ValueError(f"The {i} position of {configname} is not of type {datatype}") + len_check = ["PUMP_PINS", "PUMP_VOLUMEFLOW"] + if configname in len_check: + self.__validate_list_length(configlist, configname) + + def __validate_list_length(self, configlist, configname): + min_len = self.MAKER_NUMBER_BOTTLES + # limit the check to max 16 (supported) bottles + supported_bottle_count = 16 + min_len = min(min_len, supported_bottle_count) + actual_len = len(configlist) + if actual_len < min_len: + raise ValueError(f"{configname} is only {actual_len} elements, but you need at least {min_len} elements") class Shared: From 38c2347154ac056f87608fdcd5ef360e0903458f Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Mon, 7 Mar 2022 20:29:48 +0100 Subject: [PATCH 07/11] Added custom configerror class --- src/config_manager.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/config_manager.py b/src/config_manager.py index 0c12b902..6b04dda4 100644 --- a/src/config_manager.py +++ b/src/config_manager.py @@ -106,7 +106,7 @@ def __validate_config_type(self, configname, configvalue): if isinstance(configvalue, list): self.__validate_config_list_type(configname, configvalue) return - raise ValueError(f"The config option {configname} is not of type {datatype}") + raise ConfigError(f"The config option {configname} is not of type {datatype}") def __validate_config_list_type(self, configname, configlist): config_type = { @@ -117,7 +117,7 @@ def __validate_config_list_type(self, configname, configlist): datatype = config_type.get(configname) for i, config in enumerate(configlist, 1): if not isinstance(config, datatype): - raise ValueError(f"The {i} position of {configname} is not of type {datatype}") + raise ConfigError(f"The {i} position of {configname} is not of type {datatype}") len_check = ["PUMP_PINS", "PUMP_VOLUMEFLOW"] if configname in len_check: self.__validate_list_length(configlist, configname) @@ -129,7 +129,7 @@ def __validate_list_length(self, configlist, configname): min_len = min(min_len, supported_bottle_count) actual_len = len(configlist) if actual_len < min_len: - raise ValueError(f"{configname} is only {actual_len} elements, but you need at least {min_len} elements") + raise ConfigError(f"{configname} is only {actual_len} elements, but you need at least {min_len} elements") class Shared: @@ -143,6 +143,10 @@ def __init__(self): self.handaddlist: List[Ingredient] = [] +class ConfigError(Exception): + """Raised when there was an error with the configuration data""" + + def version_callback(value: bool): if value: typer.echo(f"{PROJECT_NAME} Version {__version__}. Created by Andre Wohnsland.") From 208456c31ac519adbb60815520fa6e37c4694b4b Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Mon, 7 Mar 2022 21:49:27 +0100 Subject: [PATCH 08/11] Adding missing constraint --- Cocktail_database_default.db | Bin 40960 -> 45056 bytes src/migrator.py | 2 ++ 2 files changed, 2 insertions(+) diff --git a/Cocktail_database_default.db b/Cocktail_database_default.db index 298417f1b818787686ad495b55a4b67f8f10e364..e07b0dac6aeef97fc209c9c14f978ed6a8b6167b 100644 GIT binary patch delta 391 zcmZoTz|`=7X@az12?GNIHxR?XoryZeiX{wsj8VK?FBrHu&Dr>^xSe?t_=e7pg<|x=C5qum?OA#r5PK!*=+m**u)j38S^vqQc^22Q!3(<@=Ho`Qk}qL zF}HJ&t7C|(La3i-V5qBtr=N>!gaSg9g1?^vRHX)l*4*sOeXvDEfWJnX{}=xU{%8Dm z_%HFF;NQo;g?|>!ej4MeiC Tf=Ct?5XsC8BAJ+&nK?NDY7bOa delta 232 zcmZp8z|?SnX@az1F#`hw7ZAh1?TI?Z^2H2#_BVOCUNCTSnzQj+aXa%Q@D=e+;=IhO z%X5~~d~={cIosy1Y~Pq8qIIPi8@btR*ueUejoHP)0-1R!sTG+i74cQ2C5a`edGUFP zxv5bQHj8tRt7C|(La3i-U?`gtn;%rKGe|F+KZLj0nfqXi3K#zZY5rgQANZf~-{HT+ ze}aD>{}%pL{0n&h@$Tg9;mzT-;T74eF(HJ1a&x|jfQ>aX7lSe*Qy>QiCnL~3lNZcS F0031FJGTG; diff --git a/src/migrator.py b/src/migrator.py index 551714e0..ab4037fc 100644 --- a/src/migrator.py +++ b/src/migrator.py @@ -112,6 +112,8 @@ def __add_more_bottles_to_db(self): """Updates the bottles to support up to 16 bottles""" logger.log_event("INFO", "Adding bottle numbers 11 to 16 to DB") db_handler = DatabaseHandler() + # Adding constraint if still missing + db_handler.query_database("CREATE UNIQUE INDEX IF NOT EXISTS idx_bottle ON Bottles(Bottle)") for bottle_count in range(11, 17): db_handler.query_database("INSERT OR IGNORE INTO Bottles(Bottle) VALUES (?)", (bottle_count,)) From f29f72bb87eada71c77be1c9d519db3708c3f9c7 Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:05:32 +0100 Subject: [PATCH 09/11] Added supported bottle count --- src/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/__init__.py b/src/__init__.py index 4f3d0ec9..9e6755a7 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,2 +1,3 @@ __version__ = "1.6.1" PROJECT_NAME = "CocktailBerry" +MAX_SUPPORTED_BOTTLES = 16 From d90bfc4375c8baae252bb53aafbf1ee2e00674cb Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:06:56 +0100 Subject: [PATCH 10/11] Using new refactored funktion and vars --- src/config_manager.py | 34 ++++++++++++++++++++-------------- src/display_controller.py | 21 +++++++-------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/config_manager.py b/src/config_manager.py index 6b04dda4..f011c1c8 100644 --- a/src/config_manager.py +++ b/src/config_manager.py @@ -5,7 +5,7 @@ from src.logger_handler import LoggerHandler from src.models import Ingredient -from src import __version__, PROJECT_NAME +from src import __version__, PROJECT_NAME, MAX_SUPPORTED_BOTTLES CONFIG_FILE = Path(__file__).parents[1].absolute() / "custom_config.yaml" @@ -74,6 +74,7 @@ def sync_config_to_file(self): yaml.dump(config, stream, default_flow_style=False) def __read_config(self): + """Reads all the config data from the file and validates it""" with open(CONFIG_FILE, "r", encoding="UTF-8") as stream: configuration = yaml.safe_load(stream) for k, value in configuration.items(): @@ -81,6 +82,7 @@ def __read_config(self): setattr(self, k, value) def __validate_config_type(self, configname, configvalue): + """validates the configvalue if its fit the type / conditions""" config_type = { "UI_DEVENVIRONMENT": bool, "UI_PARTYMODE": bool, @@ -109,28 +111,32 @@ def __validate_config_type(self, configname, configvalue): raise ConfigError(f"The config option {configname} is not of type {datatype}") def __validate_config_list_type(self, configname, configlist): + """Extra validation for list type in case len / types""" + min_bottles = self._choose_bottle_number() config_type = { - "PUMP_PINS": int, - "PUMP_VOLUMEFLOW": int, - "TEAM_BUTTON_NAMES": str, + "PUMP_PINS": (int, min_bottles), + "PUMP_VOLUMEFLOW": (int, min_bottles), + "TEAM_BUTTON_NAMES": (str, 2), } - datatype = config_type.get(configname) + datatype, min_len = config_type.get(configname) for i, config in enumerate(configlist, 1): if not isinstance(config, datatype): raise ConfigError(f"The {i} position of {configname} is not of type {datatype}") - len_check = ["PUMP_PINS", "PUMP_VOLUMEFLOW"] - if configname in len_check: - self.__validate_list_length(configlist, configname) - - def __validate_list_length(self, configlist, configname): - min_len = self.MAKER_NUMBER_BOTTLES - # limit the check to max 16 (supported) bottles - supported_bottle_count = 16 - min_len = min(min_len, supported_bottle_count) + # aditional len check of the list data, + self.__validate_list_length(configlist, configname, min_len) + + def __validate_list_length(self, configlist, configname, min_len): + """Checks if the list is at least a given size""" actual_len = len(configlist) if actual_len < min_len: raise ConfigError(f"{configname} is only {actual_len} elements, but you need at least {min_len} elements") + def _choose_bottle_number(self, get_all=False): + """Selects the number of Bottles, limits by max supported count""" + if get_all: + return MAX_SUPPORTED_BOTTLES + return min(self.MAKER_NUMBER_BOTTLES, MAX_SUPPORTED_BOTTLES) + class Shared: """Shared global variables which may dynamically change and are needed on different spaces""" diff --git a/src/display_controller.py b/src/display_controller.py index 44f08cda..57939852 100644 --- a/src/display_controller.py +++ b/src/display_controller.py @@ -6,8 +6,7 @@ from src.dialog_handler import DialogHandler, UI_LANGUAGE from src.models import Cocktail, Ingredient from src.config_manager import shared - -MAX_SUPPORTED_BOTTLES = 16 +from src import MAX_SUPPORTED_BOTTLES class DisplayController(DialogHandler): @@ -423,17 +422,17 @@ def set_label_bottles(self, w, label_names: List[str]): # Migration from supporter.py def get_pushbottons_newbottle(self, w, get_all=False): """Returns all new bottles toggle button objects""" - number = self.__choose_bottle_number(get_all) + number = self._choose_bottle_number(get_all) return [getattr(w, f"PBneu{x}") for x in range(1, number + 1)] def get_levelbar_bottles(self, w, get_all=False): """Returns all bottles progress bar objects""" - number = self.__choose_bottle_number(get_all) + number = self._choose_bottle_number(get_all) return [getattr(w, f"ProBBelegung{x}") for x in range(1, number + 1)] def get_comboboxes_bottles(self, w, get_all=False): """Returns all bottles combo box objects""" - number = self.__choose_bottle_number(get_all) + number = self._choose_bottle_number(get_all) return [getattr(w, f"CBB{x}") for x in range(1, number + 1)] def get_comboboxes_recipes(self, w): @@ -450,7 +449,7 @@ def get_ingredient_fields(self, w): def get_label_bottles(self, w, get_all=False): """Returns all bottles label objects""" - number = self.__choose_bottle_number(get_all) + number = self._choose_bottle_number(get_all) return [getattr(w, f"LBelegung{x}") for x in range(1, number + 1)] def get_labels_maker_volume(self, w): @@ -461,20 +460,14 @@ def get_labels_maker_ingredients(self, w): """Returns all maker label objects for ingredient name""" return [getattr(w, f"LZutat{x}") for x in range(1, 10)] - def __choose_bottle_number(self, get_all): - """Selects the number of Bottles in the bottles tab, all is ten""" - if get_all: - return MAX_SUPPORTED_BOTTLES - return min(self.MAKER_NUMBER_BOTTLES, MAX_SUPPORTED_BOTTLES) - def get_numberlabel_bottles(self, w, get_all=False): """Returns all label object for the number of the bottle""" - number = self.__choose_bottle_number(get_all) + number = self._choose_bottle_number(get_all) return [getattr(w, f"bottleLabel{x}") for x in range(1, number + 1)] def adjust_bottle_number_displayed(self, w): """Removes the UI elements if not all ten bottles are used per config""" - used_bottles = min(self.MAKER_NUMBER_BOTTLES, MAX_SUPPORTED_BOTTLES) + used_bottles = self._choose_bottle_number() # This needs to be done to get rid of registered bottles in the then removed bottles all_bottles = DB_COMMANDER.get_ingredients_at_bottles() DB_COMMANDER.set_bottleorder(all_bottles[:used_bottles] + [""] * (MAX_SUPPORTED_BOTTLES - used_bottles)) From 030b4a7c41f157e1d0fc01de661dc75dd65f6f0e Mon Sep 17 00:00:00 2001 From: Andre Wohnsland <50302161+AndreWohnsland@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:09:17 +0100 Subject: [PATCH 11/11] Refactored using new parent function --- src/ui/setup_bottle_window.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/ui/setup_bottle_window.py b/src/ui/setup_bottle_window.py index 7d438486..59a1dcaf 100644 --- a/src/ui/setup_bottle_window.py +++ b/src/ui/setup_bottle_window.py @@ -8,8 +8,7 @@ from src.database_commander import DB_COMMANDER from src.dialog_handler import UI_LANGUAGE from src.display_controller import DP_CONTROLLER - -MAX_SUPPORTED_BOTTLES = 16 +from src import MAX_SUPPORTED_BOTTLES class BottleWindow(QMainWindow, Ui_Bottlewindow, ConfigManager): @@ -32,7 +31,7 @@ def __init__(self, parent=None): self.maxvolume = [] self.asign_bottle_data() # creates lists of the objects and assings functions later through a loop - number = self.__choose_bottle_number() + number = self._choose_bottle_number() myplus = [getattr(self, f"PBMplus{x}") for x in range(1, MAX_SUPPORTED_BOTTLES + 1)] myminus = [getattr(self, f"PBMminus{x}") for x in range(1, MAX_SUPPORTED_BOTTLES + 1)] mylabel = [getattr(self, f"LAmount{x}") for x in range(1, MAX_SUPPORTED_BOTTLES + 1)] @@ -54,17 +53,13 @@ def __init__(self, parent=None): self.showFullScreen() DP_CONTROLLER.set_display_settings(self) - def __choose_bottle_number(self): - """Selects the number of Bottles in the bottles tab, all is ten""" - return min(self.MAKER_NUMBER_BOTTLES, MAX_SUPPORTED_BOTTLES) - def abbrechen_clicked(self): """ Closes the Window without a change. """ self.close() def eintragen_clicked(self): """ Enters the Data and closes the window. """ - number = self.__choose_bottle_number() + number = self._choose_bottle_number() labelname = [getattr(self, f"LAmount{i}") for i in range(1, number + 1)] for label, ingredient_id, maxvolume in zip(labelname, self.id_list, self.maxvolume): new_amount = min(int(label.text()), maxvolume) @@ -73,7 +68,7 @@ def eintragen_clicked(self): self.close() def asign_bottle_data(self): - number = self.__choose_bottle_number() + number = self._choose_bottle_number() bottle_data = DB_COMMANDER.get_bottle_data_bottle_window()[:number] for i, (ingredient_name, bottle_level, ingredient_id, ingredient_volume) in enumerate(bottle_data, start=1): labelobj = getattr(self, f"LName{i}")