diff --git a/assets/icon.png b/assets/icon.png new file mode 100644 index 0000000..e0314ab Binary files /dev/null and b/assets/icon.png differ diff --git a/assets/tab-icons/icon.png b/assets/tab-icons/icon.png new file mode 100644 index 0000000..e0314ab Binary files /dev/null and b/assets/tab-icons/icon.png differ diff --git a/changelog-UC.txt b/changelog-UC.txt index f98cec9..fbc3df0 100644 --- a/changelog-UC.txt +++ b/changelog-UC.txt @@ -88,4 +88,8 @@ 4.0 Alpha (Build 20220) - Zastosowanie nowego systemu przetwarzania plików konfiguracyjnych dla pliku 'config.cfg' (tylko odczyt) -- Rozpoczęcie prac nad skryptem przetwarzającym dane \ No newline at end of file +- Rozpoczęcie prac nad skryptem przetwarzającym dane + +4.0 Alpha (Build 20221) +- Zastosowanie nowego systemu przetwarzania plików konfiguracyjnych dla pliku 'style.cfg' +- Lekkie zmiany w interfejsie \ No newline at end of file diff --git a/default-configs/style.cfg b/default-configs/style.cfg index addf2fd..4c6908c 100644 --- a/default-configs/style.cfg +++ b/default-configs/style.cfg @@ -1,108 +1,109 @@ -windowWidth = 1200 -windowHeight = 720 -windowWidthResizable = 0 -windowHeightResizable = 0 -windowMainBG = #21242D -mainIcon = assets/icon.ico -mainMenuBG = #21242D -mainMenuPosition = wn -tabIconsSize = 30 -generateTabIcon = assets/tab-icons/generate.png -tabFramesBorderWidth = 0 -unselectedTabBG = #21242D -menuTabsBorderWidth = 0 -menuTabsPadding = 10 -selectedTabBG = #333842 -disabledTabBG = #333842 -headerFont = Segoe UI;15 -headerBG = #333842 -headerTextColor = #C0C0C0 -headerPadding = 10 -headerWidth = 84 -tabFrameBG = #21242D -formatTabIcon = assets/tab-icons/format.png -settingsTabIcon = assets/tab-icons/settings.png -aboutTabIcon = assets/tab-icons/about.png -tabFramePadding = 10 -label1BG = #21242D -label1TextColor = #C0C0C0 -headerTextAnchor = center -combobox1ArrowColor = #C0C0C0 -combobox1ButtonColor = #333842 -combobox1BorderColor = #21242D -combobox1FieldBackground = #333842 -combobox1TextColor = #C0C0C0 -combobox1Relief = flat -combobox1BorderWidth = 0 -combobox1Padding = 5 -combobox1ListBoxBackground = #333842 -combobox1ListBoxForeground = #C0C0C0 -combobox1ListBoxSelectBackground = #737373 -combobox1ListBoxSelectForeground = #FFFFFF -button1TextAnchor = center -button1Background = #333842 -button1Foreground = #C0C0C0 -button1Padding = 4 -editingPresetSaveButtonWidth = 25 -editingPresetCancelButtonWidth = 25 -loadingButtonWidth = 15 -loadingListWidth = 85 -generateFilesLabelWidth = 15 -generateFilesLabelAnchor = center -spinbox1ArrowColor = #C0C0C0 -spinbox1FieldBackground = #333842 -spinbox1Relief = flat -spinbox1BorderWidth = 0 -spinbox1TextColor = #C0C0C0 -spinbox1ButtonColor = #333842 -spinbox1Padding = 7 -radiobutton1Background = #21242D -radiobutton1TextColor = #C0C0C0 -entry1FieldBackground = #333842 -entry1Relief = flat -entry1BorderWidth = 0 -entry1Padding = 7 -text1Background = #333842 -text1TextColor = #C0C0C0 -text1Relief = flat -entry1TextColor = #C0C0C0 -label2BG = #21242D -label2TextColor = #C0C0C0 -label3BG = #21242D -label3TextColor = #C0C0C0 -label3Anchor = w -radiobutton1IndicatorBackground = #21242D -loadingListPadX = 12 -EPOSTypeStudentRadiobuttonPadY = 5 -EPOSTypeStudentRadiobuttonWidth = 20 -EPOSTypeTeacherRadiobuttonPadY = 5 -EPOSTypeTeacherRadiobuttonWidth = 20 -EPOSPersonSeparatorEntryWidth = 56 -EPOSRowSeparatorEntryWidth = 56 -EPOSDataSeparatorTextWidth = 42 -EPOSDataSeparatorTextHeight = 17 -EPDataLocalizationPadX = 6 -EPDataLocalizationPadY = 6 -label3BG = #21242D -label3TextColor = #C0C0C0 -label3Font = Segoe UI;6 -GIFSLocalizationEntryWidth = 109 -GIFFrameSeparators = 16 -generateInputFilesPlusMinusButtonsWidth = 2 -generateResetButtonWidth = 10 -generateInputFilesPadding = 6 -generateOutputFilesPadding = 6 -combobox2ArrowColor = #C0C0C0 -combobox2ButtonColor = #333842 -combobox2BorderColor = #21242D -combobox2FieldBackground = #333842 -combobox2TextColor = #C0C0C0 -combobox2Relief = flat -combobox2BorderWidth = 0 -combobox2Padding = 7 -combobox2ListBoxBackground = #333842 -combobox2ListBoxForeground = #C0C0C0 -combobox2ListBoxSelectBackground = #737373 -combobox2ListBoxSelectForeground = #FFFFFF -EPOSLabelWidth = 30 -EPOSLabelAnchor = center \ No newline at end of file +windowWidth(I) = 1200 +windowHeight(I) = 720 +windowWidthResizable(B) = 0 +windowHeightResizable(B) = 0 +windowMainBG(C) = #21242D +mainIcon(P) = icon.ico +mainMenuBG(C) = #21242D +mainMenuPosition(FAposition) = wn +tabFramesBorderWidth(I) = 0 +unselectedTabBG(C) = #21242D +menuTabsBorderWidth(I) = 0 +menuTabsPadding(I) = 10 +selectedTabBG(C) = #333842 +disabledTabBG(C) = #333842 +tabFrameBG(C) = #21242D +headerFont(F) = Segoe UI;15 +headerBG(C) = #333842 +headerTextColor(C) = #C0C0C0 +headerPadding(I) = 10 +headerTextAnchor(FAanchor) = center +contentTabFrameBG(C) = #21242D +layoutFrameBG(C) = #21242D +label1BG(C) = #21242D +label1TextColor(C) = #C0C0C0 +label1Font(F) = Segoe UI;10 +label2BG(C) = #21242D +label2TextColor(C) = #C0C0C0 +label2Font(F) = Segoe UI;9 +combobox1ArrowColor(C) = #C0C0C0 +combobox1ButtonColor(C) = #333842 +combobox1BorderColor(C) = #21242D +combobox1FieldBackground(C) = #333842 +combobox1TextColor(C) = #C0C0C0 +combobox1Relief(FArelief) = flat +combobox1BorderWidth(I) = 0 +combobox1Padding(I) = 5 +combobox1ListBoxBackground(C) = #333842 +combobox1ListBoxForeground(C) = #C0C0C0 +combobox1ListBoxSelectBackground(C) = #737373 +combobox1ListBoxSelectForeground(C) = #FFFFFF +combobox2ArrowColor(C) = #C0C0C0 +combobox2ButtonColor(C) = #333842 +combobox2BorderColor(C) = #21242D +combobox2FieldBackground(C) = #333842 +combobox2TextColor(C) = #C0C0C0 +combobox2Relief(FArelief) = flat +combobox2BorderWidth(I) = 0 +combobox2Padding(I) = 7 +combobox2ListBoxBackground(C) = #333842 +combobox2ListBoxForeground(C) = #C0C0C0 +combobox2ListBoxSelectBackground(C) = #737373 +combobox2ListBoxSelectForeground(C) = #FFFFFF +button1TextAnchor(FAanchor) = center +button1Background(C) = #333842 +button1Foreground(C) = #C0C0C0 +button1Padding(I) = 4 +separator1BG(C) = #21242D +spinbox1ArrowColor(C) = #C0C0C0 +spinbox1FieldBackground(C) = #333842 +spinbox1Relief(FArelief) = flat +spinbox1BorderWidth(I) = 0 +spinbox1TextColor(C) = #C0C0C0 +spinbox1ButtonColor(C) = #333842 +spinbox1Padding(I) = 7 +entry1FieldBackground(C) = #333842 +entry1Relief(FArelief) = flat +entry1BorderWidth(I) = 0 +entry1Padding(I) = 7 +entry1TextColor(C) = #C0C0C0 +iconTabIcon(P) = assets/tab-icons/icon.png +tabIconsSize(I) = 30 +generateTabIcon(P) = assets/tab-icons/generate.png +headerFill(FAfill) = x +tabFramePadding(I) = 10 +contentTabFrameFill(FAfill) = both +contentTabFrameExpand(I) = 1 +outsidelayoutFramesPadX(I) = 6 +GIFFrameSeparators(I) = 16 +generateFilesLabelWidth(I) = 15 +generateFilesLabelAnchor(FAanchor) = center +generateInputFilesPadding(I) = 6 +generateHorizontalSeparatorPadY(I) = 10 +generateOutputFilesPadding(I) = 6 +generateStartButtonPadding(I) = 10 +generateStartButtonPadY(I) = 6 +formatTabIcon(P) = assets/tab-icons/format.png +loadingListPadX(I) = 12 +loadingButtonWidth(I) = 15 +formatHorizontalSeparatorPadY(I) = 10 +formatVerticalSeparatorPadY(I) = 10 +EPOSTypeFramePadY(I) = 0 +EPOSPersonSeparatorFramePadY(I) = 0 +EPOSRowSeparatorFramePadY(I) = 0 +EPOSDataSeparatorFramePadY(I) = 7 +EPOSLabelWidth(I) = 30 +EPOSLabelAnchor(FAanchor) = center +radiobutton1Background(C) = #21242D +radiobutton1TextColor(C) = #C0C0C0 +radiobutton1IndicatorBackground(C) = #21242D +text1Background(C) = #333842 +text1TextColor(C) = #C0C0C0 +text1Relief(FArelief) = flat +EPDataLocalizationPadX(I) = 6 +EPDataLocalizationPadY(I) = 6 +editingPresetButtonsPadY(I) = 6 +editingPresetSaveButtonWidth(I) = 25 +editingPresetCancelButtonWidth(I) = 25 +settingsTabIcon(P) = assets/tab-icons/settings.png +aboutTabIcon(P) = assets/tab-icons/about.png \ No newline at end of file diff --git a/generator.pyw b/generator.pyw index ee7f221..12fe2d6 100644 --- a/generator.pyw +++ b/generator.pyw @@ -12,7 +12,7 @@ # ----------------------------------------- # Zmienne # ----------------------------------------- # -class VARS: +class VAR: programName = 'Generator CSV' programVersion = '4.0' programCustomer = 'ZSP Sobolew' @@ -126,7 +126,7 @@ if 'Generator CSV' not in [x for x in OS.listdir(appdata)]: class CFG: # Funkcje sprawdzające istnienie - def __checkIfConfigFileExist(self, write): + def __checkIfFileExist(self, write): if write: try: file = open((str(appdata) + '\Generator CSV\config.cfg'), 'a') @@ -205,7 +205,7 @@ class CFG: def R(self, record): - self.__checkIfConfigFileExist(False) + self.__checkIfFileExist(False) content = {} for x in CD.open((str(appdata) + '\Generator CSV\config.cfg'), 'r', 'utf-8').read().split('\n'): x = x.split(' = ') @@ -250,381 +250,170 @@ class CFG: def W(self): pass + """ + content = self.R() + for x in changes: + content[x] = changes[x] + contentCheckingOutput = self.__checkContent(True, content) + if contentCheckingOutput[0]: + if self.__checkInstance(True): + with CD.open((str(appdata) + '\Generator CSV\config.cfg'), 'w', 'utf-8') as file: + contentToSave = contentCheckingOutput[1] + for x in contentToSave: + file.write('%s = %s\n' % (x, str(contentToSave[x]))) + else: + return False + else: + MSG('E0004', False, contentCheckingOutput[1]) + """ CFG = CFG() -print(CFG.R('allowedCharactersInSeparator')) + # ---------------------------------- # Ładowanie pliku stylu # ---------------------------------- # class GUI: - def __checkInstance(self): + # Funkcje sprawdzające istnienie + def __checkIfFileExist(self): try: open(str(appdata) + '\Generator CSV\style.cfg') except Exception as exceptInfo: MSG('E0004', True, exceptInfo) - - def __checkContent(self, content): - class functions: - def integer(self, var): - if var in list(content.keys()): - try: - check = int(content[var]) - except: - return [False, 'Niepoprawne dane - klucz: %s' % var] - else: - content[var] = int(content[var]) - return [True] - else: - return [False, 'Brak danych - klucz: %s' % var] - def bool(self, var): - if var in list(content.keys()): - if content[var] != '0' and content[var] != '1': - return [False, 'Niepoprawne dane - klucz: %s' % var] - else: - if content[var] == '0': - content[var] = False - return [True] - else: - content[var] = True - return [True] - else: - return [False, 'Brak danych - klucz: %s' % var] - def color(self, var): - if var in list(content.keys()): - if len(content[var]) != 7: - return [False, 'Niepoprawne dane - klucz: %s' % var] - else: - if content[var][0] != '#': - return [False, 'Niepoprawne dane - klucz: %s' % var] - else: - return [True] - else: - return [False, 'Brak danych - klucz: %s' % var] - def file(self, var): - if var in list(content.keys()): - try: - check = open(content[var]) - except: - return [False, 'Niepoprawne dane - klucz: %s' % var] - else: - return [True] - else: - return [False, 'Brak danych - klucz: %s' % var] - def fromArray(self, var, array): - if var in list(content.keys()): - if content[var] not in array: - return [False, 'Niepoprawne dane - klucz: %s' % var] - else: - return [True] - else: - return [False, 'Brak danych - klucz: %s' % var] - def font(self, var): - if var in list(content.keys()): - try: - check = int(content[var].split(';')[1]) - except: - return [False, 'Niepoprawne dane - klucz: %s' % var] - else: - content[var] = (content[var].split(';')[0], int(content[var].split(';')[1])) - return [True] - else: - return [False, 'Brak danych - klucz: %s' % var] - functions = functions() - check = functions.integer('windowWidth') - if not check[0]: - return check - check = functions.integer('windowHeight') - if not check[0]: - return check - check = functions.bool('windowWidthResizable') - if not check[0]: - return check - check = functions.bool('windowHeightResizable') - if not check[0]: - return check - check = functions.color('windowMainBG') - if not check[0]: - return check - check = functions.file('mainIcon') - if not check[0]: - return check - check = functions.color('mainMenuBG') - if not check[0]: - return check - check = functions.fromArray('mainMenuPosition', ['nw', 'ne', 'en', 'es', 'se', 'sw', 'ws', 'wn']) - if not check[0]: - return check - check = functions.integer('tabIconsSize') - if not check[0]: - return check - check = functions.file('generateTabIcon') - if not check[0]: - return check - check = functions.integer('tabFramesBorderWidth') - if not check[0]: - return check - check = functions.color('unselectedTabBG') - if not check[0]: - return check - check = functions.integer('menuTabsBorderWidth') - if not check[0]: - return check - check = functions.integer('menuTabsPadding') - if not check[0]: - return check - check = functions.color('selectedTabBG') - if not check[0]: - return check - check = functions.color('disabledTabBG') - if not check[0]: - return check - check = functions.font('headerFont') - if not check[0]: - return check - check = functions.color('headerBG') - if not check[0]: - return check - check = functions.color('headerTextColor') - if not check[0]: - return check - check = functions.integer('headerPadding') - if not check[0]: - return check - check = functions.integer('headerWidth') - if not check[0]: - return check - check = functions.color('tabFrameBG') - if not check[0]: - return check - check = functions.file('formatTabIcon') - if not check[0]: - return check - check = functions.integer('tabFramePadding') - if not check[0]: - return check - check = functions.color('label1BG') - if not check[0]: - return check - check = functions.color('label1TextColor') - if not check[0]: - return check - check = functions.fromArray('headerTextAnchor', ['center', 'nw', 'n', 'ne', 'w', 'e', 'sw', 's', 'se']) - if not check[0]: - return check - check = functions.color('combobox1ArrowColor') - if not check[0]: - return check - check = functions.color('combobox1ButtonColor') - if not check[0]: - return check - check = functions.color('combobox1BorderColor') - if not check[0]: - return check - check = functions.color('combobox1FieldBackground') - if not check[0]: - return check - check = functions.color('combobox1TextColor') - if not check[0]: - return check - check = functions.fromArray('combobox1Relief', ['flat', 'raised', 'sunken', 'groove', 'ridge']) - if not check[0]: - return check - check = functions.integer('combobox1BorderWidth') - if not check[0]: - return check - check = functions.integer('combobox1Padding') - if not check[0]: - return check - check = functions.color('combobox1ListBoxBackground') - if not check[0]: - return check - check = functions.color('combobox1ListBoxForeground') - if not check[0]: - return check - check = functions.color('combobox1ListBoxSelectBackground') - if not check[0]: - return check - check = functions.color('combobox1ListBoxSelectForeground') - if not check[0]: - return check - check = functions.fromArray('button1TextAnchor', ['center', 'nw', 'n', 'ne', 'w', 'e', 'sw', 's', 'se']) - if not check[0]: - return check - check = functions.color('button1Background') - if not check[0]: - return check - check = functions.color('button1Foreground') - if not check[0]: - return check - check = functions.integer('button1Padding') - if not check[0]: - return check - check = functions.integer('editingPresetSaveButtonWidth') - if not check[0]: - return check - check = functions.integer('editingPresetCancelButtonWidth') - if not check[0]: - return check - check = functions.integer('loadingButtonWidth') - if not check[0]: - return check - check = functions.integer('loadingListWidth') - if not check[0]: - return check - check = functions.integer('generateFilesLabelWidth') - if not check[0]: - return check - check = functions.fromArray('generateFilesLabelAnchor', ['center', 'nw', 'n', 'ne', 'w', 'e', 'sw', 's', 'se']) - if not check[0]: - return check - check = functions.color('spinbox1ArrowColor') - if not check[0]: - return check - check = functions.color('spinbox1FieldBackground') - if not check[0]: - return check - check = functions.fromArray('spinbox1Relief', ['flat', 'raised', 'sunken', 'groove', 'ridge']) - if not check[0]: - return check - check = functions.integer('spinbox1BorderWidth') - if not check[0]: - return check - check = functions.color('spinbox1TextColor') - if not check[0]: - return check - check = functions.color('spinbox1ButtonColor') - if not check[0]: - return check - check = functions.color('radiobutton1Background') - if not check[0]: - return check - check = functions.color('radiobutton1TextColor') - if not check[0]: - return check - check = functions.color('entry1FieldBackground') - if not check[0]: - return check - check = functions.fromArray('entry1Relief', ['flat', 'raised', 'sunken', 'groove', 'ridge']) - if not check[0]: - return check - check = functions.integer('entry1BorderWidth') - if not check[0]: - return check - check = functions.integer('entry1Padding') - if not check[0]: - return check - check = functions.color('text1Background') - if not check[0]: - return check - check = functions.color('text1TextColor') - if not check[0]: - return check - check = functions.fromArray('text1Relief', ['flat', 'raised', 'sunken', 'groove', 'ridge']) - if not check[0]: - return check - check = functions.color('entry1TextColor') - if not check[0]: - return check - check = functions.color('label2BG') - if not check[0]: - return check - check = functions.color('label2TextColor') - if not check[0]: - return check - check = functions.color('label3BG') - if not check[0]: - return check - check = functions.color('label3TextColor') - if not check[0]: - return check - check = functions.fromArray('label3Anchor', ['center', 'nw', 'n', 'ne', 'w', 'e', 'sw', 's', 'se']) - if not check[0]: - return check - check = functions.color('radiobutton1IndicatorBackground') - if not check[0]: - return check - check = functions.integer('loadingListPadX') - if not check[0]: - return check - check = functions.integer('EPOSTypeStudentRadiobuttonPadY') - if not check[0]: - return check - check = functions.integer('EPOSTypeStudentRadiobuttonWidth') - if not check[0]: - return check - check = functions.integer('EPOSTypeTeacherRadiobuttonWidth') - if not check[0]: - return check - check = functions.integer('EPOSTypeTeacherRadiobuttonPadY') - if not check[0]: - return check - check = functions.integer('EPOSPersonSeparatorEntryWidth') - if not check[0]: - return check - check = functions.integer('EPOSRowSeparatorEntryWidth') - if not check[0]: - return check - check = functions.integer('EPOSDataSeparatorTextWidth') - if not check[0]: - return check - check = functions.integer('EPOSDataSeparatorTextHeight') - if not check[0]: - return check - check = functions.integer('EPDataLocalizationPadX') - if not check[0]: - return check - check = functions.integer('EPDataLocalizationPadY') - if not check[0]: - return check - check = functions.color('label3BG') - if not check[0]: - return check - check = functions.color('label3TextColor') - if not check[0]: - return check - check = functions.font('label3Font') - if not check[0]: - return check - check = functions.integer('GIFSLocalizationEntryWidth') - if not check[0]: - return check - check = functions.integer('GIFFrameSeparators') - if not check[0]: - return check - check = functions.integer('generateInputFilesPlusMinusButtonsWidth') - if not check[0]: - return check - check = functions.integer('generateResetButtonWidth') - if not check[0]: - return check - check = functions.integer('generateInputFilesPadding') - if not check[0]: - return check - check = functions.integer('generateOutputFilesPadding') - if not check[0]: - return check - return [True, content] - def R(self): - self.__checkInstance() + def __checkIfRecordExist(self, content, record): + if record in list(content.keys()): + return [True] + else: + return [False, 'Brak danych - klucz: %s' % record] + + + # Funkcje sprawdzające poprawność rekordu + def __checkI(self, record, var): + try: + var = int(var) + except: + return (False, 'Niepoprawne dane - klucz: %s' % record) + return [True, var] + + def __checkB(self, record, var): + try: + var = int(var) + except: + return [False, 'Niepoprawne dane - klucz: %s' % record] + if var != 0 and var != 1: + return [False, 'Niepoprawne dane - klucz: %s' % record] + else: + if var == 0: + var = False + else: + var = True + return [True, var] + + def __checkC(self, record, var): + if len(var) != 7: + return [False, 'Niepoprawne dane - klucz: %s' % record] + else: + if var[0] != '#': + return [False, 'Niepoprawne dane - klucz: %s' % record] + return [True, var] + + def __checkP(self, record, var): + try: + check = open(var) + except: + return [False, 'Niepoprawne dane - klucz: %s' % record] + return [True, var] + + def __checkFA(self, record, var, array): + arrays = { + 'position' : ['nw', 'ne', 'en', 'es', 'se', 'sw', 'ws', 'wn'], + 'anchor' : ['center', 'nw', 'n', 'ne', 'w', 'e', 'sw', 's', 'se'], + 'relief' : ['flat', 'raised', 'sunken', 'groove', 'ridge'], + 'fill' : ['x', 'y', 'both'], + } + if var not in arrays[array]: + return [False, 'Niepoprawne dane - klucz: %s' % record] + return [True, var] + + def __checkF(self, record, var): + try: + check = int(var.split(';')[1]) + except: + return [False, 'Niepoprawne dane - klucz: %s' % record] + else: + var = (var.split(';')[0], int(var.split(';')[1])) + return [True, var] + + + + def R(self, record): + self.__checkIfFileExist() content = {} for x in CD.open((str(appdata) + '\Generator CSV\style.cfg'), 'r', 'utf-8').read().split('\n'): x = x.split(' = ') try: - content[x[0]] = (x[1]).strip('\r') + name = x[0].split('(')[0] + var = x[1] + type = x[0].split('(')[1].strip(')') + content[name] = [var.strip('\r'), type] except: continue - contentCheckingOutput = self.__checkContent(content) - if contentCheckingOutput[0]: - return contentCheckingOutput[1] + checkingOutput = self.__checkIfRecordExist(content, record) + if not checkingOutput[0]: + MSG('E0005', True, checkingOutput[1]) + var = content[record] + if var[1] == 'I': + # Integer + checkingOutput = self.__checkI(record, var[0]) + if checkingOutput[0]: + return checkingOutput[1] + else: + MSG('E0005', True, checkingOutput[1]) + elif var[1] == 'B': + # Boolean + checkingOutput = self.__checkB(record, var[0]) + if checkingOutput[0]: + return checkingOutput[1] + else: + MSG('E0005', True, checkingOutput[1]) + elif var[1] == 'C': + # Color + checkingOutput = self.__checkC(record, var[0]) + if checkingOutput[0]: + return checkingOutput[1] + else: + MSG('E0005', True, checkingOutput[1]) + elif var[1] == 'P': + # Path + checkingOutput = self.__checkP(record, var[0]) + if checkingOutput[0]: + return checkingOutput[1] + else: + MSG('E0005', True, checkingOutput[1]) + elif (var[1])[:2] == 'FA': + # From Array + checkingOutput = self.__checkFA(record, var[0], (var[1])[2:]) + if checkingOutput[0]: + return checkingOutput[1] + else: + MSG('E0005', True, checkingOutput[1]) + elif var[1] == 'F': + # Font + checkingOutput = self.__checkF(record, var[0]) + if checkingOutput[0]: + return checkingOutput[1] + else: + MSG('E0005', True, checkingOutput[1]) else: - MSG('E0005', True, contentCheckingOutput[1]) + MSG('E0005', True, 'Nie można rozpoznać typu klucza %s' % record) + + + GUI = GUI() -checkInstance = GUI.R() @@ -978,11 +767,11 @@ class mainWindow: def __init__(self, master): # Okno self.master = master - master.title('%s %s' % (VARS.programName, VARS.programVersion)) - master.geometry('%sx%s' % (str(GUI.R()['windowWidth']), str(GUI.R()['windowHeight']))) - master.resizable(width = GUI.R()['windowWidthResizable'], height = GUI.R()['windowHeightResizable']) - master.configure(bg = GUI.R()['windowMainBG']) - master.iconbitmap(GUI.R()['mainIcon']) + master.title('%s %s' % (VAR.programName, VAR.programVersion)) + master.geometry('%ix%i' % (GUI.R('windowWidth'), GUI.R('windowHeight'))) + master.resizable(width = GUI.R('windowWidthResizable'), height = GUI.R('windowHeightResizable')) + master.configure(bg = GUI.R('windowMainBG')) + master.iconbitmap(GUI.R('mainIcon')) @@ -991,116 +780,117 @@ class mainWindow: TKttk.Style().theme_create("main", parent = "default", settings = { "mainMenu.TNotebook": { "configure": { - "background": GUI.R()['mainMenuBG'], - "tabposition": GUI.R()['mainMenuPosition'], - "borderwidth": GUI.R()['tabFramesBorderWidth'], + "background": GUI.R('mainMenuBG'), + "tabposition": GUI.R('mainMenuPosition'), + "borderwidth": GUI.R('tabFramesBorderWidth'), }, }, "mainMenu.TNotebook.Tab": { "configure": { - "background": GUI.R()['unselectedTabBG'], - "borderwidth": GUI.R()['menuTabsBorderWidth'], - "padding": GUI.R()['menuTabsPadding'], + "background": GUI.R('unselectedTabBG'), + "borderwidth": GUI.R('menuTabsBorderWidth'), + "padding": GUI.R('menuTabsPadding'), }, "map": { "background": [ - ("selected", GUI.R()['selectedTabBG']), - ("disabled", GUI.R()['disabledTabBG']), + ("selected", GUI.R('selectedTabBG')), + ("disabled", GUI.R('disabledTabBG')), ] } }, "mainMenuTabFrame.TFrame": { "configure": { - "background": GUI.R()['tabFrameBG'], + "background": GUI.R('tabFrameBG'), }, }, "tabHeader.TLabel": { "configure": { - "font": GUI.R()['headerFont'], - "background": GUI.R()['headerBG'], - "foreground": GUI.R()['headerTextColor'], - "padding": GUI.R()['headerPadding'], - "anchor": GUI.R()['headerTextAnchor'], + "font": GUI.R('headerFont'), + "background": GUI.R('headerBG'), + "foreground": GUI.R('headerTextColor'), + "padding": GUI.R('headerPadding'), + "anchor": GUI.R('headerTextAnchor'), }, }, - "tabFrame.TFrame": { + "contentTabFrame.TFrame": { "configure": { - "background": GUI.R()['tabFrameBG'], + "background": GUI.R('contentTabFrameBG'), }, }, "layoutFrame.TFrame": { "configure": { - "background": GUI.R()['tabFrameBG'], + "background": GUI.R('layoutFrameBG'), }, }, "label1.TLabel": { "configure": { - "background": GUI.R()['label1BG'], - "foreground": GUI.R()['label1TextColor'], - "font": ('Segoe UI', 10) + "background": GUI.R('label1BG'), + "foreground": GUI.R('label1TextColor'), + "font": GUI.R('label1Font'), }, }, "label2.TLabel": { "configure": { - "background": GUI.R()['label2BG'], - "foreground": GUI.R()['label2TextColor'], + "background": GUI.R('label2BG'), + "foreground": GUI.R('label2TextColor'), + "font" : GUI.R('label2Font') }, }, "combobox1.TCombobox": { "configure": { - "arrowcolor": GUI.R()['combobox1ArrowColor'], - "background": GUI.R()['combobox1ButtonColor'], - "bordercolor": GUI.R()['combobox1BorderColor'], - "fieldbackground": GUI.R()['combobox1FieldBackground'], - "foreground": GUI.R()['combobox1TextColor'], - "relief": GUI.R()['combobox1Relief'], - "borderwidth": GUI.R()['combobox1BorderWidth'], - "padding": GUI.R()['combobox1Padding'], + "arrowcolor": GUI.R('combobox1ArrowColor'), + "background": GUI.R('combobox1ButtonColor'), + "bordercolor": GUI.R('combobox1BorderColor'), + "fieldbackground": GUI.R('combobox1FieldBackground'), + "foreground": GUI.R('combobox1TextColor'), + "relief": GUI.R('combobox1Relief'), + "borderwidth": GUI.R('combobox1BorderWidth'), + "padding": GUI.R('combobox1Padding'), }, }, "combobox2.TCombobox": { "configure": { - "arrowcolor": GUI.R()['combobox2ArrowColor'], - "background": GUI.R()['combobox2ButtonColor'], - "bordercolor": GUI.R()['combobox2BorderColor'], - "fieldbackground": GUI.R()['combobox2FieldBackground'], - "foreground": GUI.R()['combobox2TextColor'], - "relief": GUI.R()['combobox2Relief'], - "borderwidth": GUI.R()['combobox2BorderWidth'], - "padding": GUI.R()['combobox2Padding'], + "arrowcolor": GUI.R('combobox2ArrowColor'), + "background": GUI.R('combobox2ButtonColor'), + "bordercolor": GUI.R('combobox2BorderColor'), + "fieldbackground": GUI.R('combobox2FieldBackground'), + "foreground": GUI.R('combobox2TextColor'), + "relief": GUI.R('combobox2Relief'), + "borderwidth": GUI.R('combobox2BorderWidth'), + "padding": GUI.R('combobox2Padding'), }, }, "button1.TButton": { "configure": { - "anchor": GUI.R()['button1TextAnchor'], - "background": GUI.R()['button1Background'], - "foreground": GUI.R()['button1Foreground'], - "padding": GUI.R()['button1Padding'], + "anchor": GUI.R('button1TextAnchor'), + "background": GUI.R('button1Background'), + "foreground": GUI.R('button1Foreground'), + "padding": GUI.R('button1Padding'), }, }, "separator1.TSeparator": { "configure": { - "background": GUI.R()['tabFrameBG'], + "background": GUI.R('separator1BG'), }, }, "spinbox1.TSpinbox": { "configure": { - "arrowcolor": GUI.R()['spinbox1ArrowColor'], - "fieldbackground": GUI.R()['spinbox1FieldBackground'], - "relief": GUI.R()['spinbox1Relief'], - "borderwidth": GUI.R()['spinbox1BorderWidth'], - "foreground": GUI.R()['spinbox1TextColor'], - "background": GUI.R()['spinbox1ButtonColor'], - "padding" : GUI.R()['spinbox1Padding'], + "arrowcolor": GUI.R('spinbox1ArrowColor'), + "fieldbackground": GUI.R('spinbox1FieldBackground'), + "relief": GUI.R('spinbox1Relief'), + "borderwidth": GUI.R('spinbox1BorderWidth'), + "foreground": GUI.R('spinbox1TextColor'), + "background": GUI.R('spinbox1ButtonColor'), + "padding" : GUI.R('spinbox1Padding'), }, }, "entry1.TEntry": { "configure": { - "fieldbackground": GUI.R()['entry1FieldBackground'], - "relief": GUI.R()['entry1Relief'], - "borderwidth": GUI.R()['entry1BorderWidth'], - "padding": GUI.R()['entry1Padding'], - "foreground": GUI.R()['entry1TextColor'], + "fieldbackground": GUI.R('entry1FieldBackground'), + "relief": GUI.R('entry1Relief'), + "borderwidth": GUI.R('entry1BorderWidth'), + "padding": GUI.R('entry1Padding'), + "foreground": GUI.R('entry1TextColor'), }, }, }) @@ -1110,14 +900,14 @@ class mainWindow: # Menu główne - self.mainMenu = TKttk.Notebook(master, width = master.winfo_width() - (2 * GUI.R()['menuTabsPadding'] + GUI.R()['tabIconsSize']), height = master.winfo_height()) + self.mainMenu = TKttk.Notebook(master, width = master.winfo_width() - (2 * GUI.R('menuTabsPadding') + GUI.R('tabIconsSize')), height = master.winfo_height()) self.mainMenu.config(style = "mainMenu.TNotebook") self.mainMenu.grid(row = 0) # Ikona self.iconTab = TKttk.Frame(self.mainMenu) - self.iconTabImg = PLimg.open(GUI.R()['mainIcon']) - self.iconTabImg = self.iconTabImg.resize((GUI.R()['tabIconsSize'], GUI.R()['tabIconsSize']), PLimg.ANTIALIAS) + self.iconTabImg = PLimg.open(GUI.R('iconTabIcon')) + self.iconTabImg = self.iconTabImg.resize((GUI.R('tabIconsSize'), GUI.R('tabIconsSize')), PLimg.ANTIALIAS) self.iconTabImg = PLitk.PhotoImage(self.iconTabImg) self.mainMenu.add(self.iconTab, image = self.iconTabImg, state = TK.DISABLED) @@ -1128,8 +918,8 @@ class mainWindow: self.generateTab = TKttk.Frame(self.mainMenu) self.generateTab.config(style = "mainMenuTabFrame.TFrame") - self.generateTabImg = PLimg.open(GUI.R()['generateTabIcon']) - self.generateTabImg = self.generateTabImg.resize((GUI.R()['tabIconsSize'], GUI.R()['tabIconsSize']), PLimg.ANTIALIAS) + self.generateTabImg = PLimg.open(GUI.R('generateTabIcon')) + self.generateTabImg = self.generateTabImg.resize((GUI.R('tabIconsSize'), GUI.R('tabIconsSize')), PLimg.ANTIALIAS) self.generateTabImg = PLitk.PhotoImage(self.generateTabImg) self.mainMenu.add(self.generateTab, image = self.generateTabImg, state = TK.NORMAL) @@ -1138,13 +928,13 @@ class mainWindow: self.generateHeader = TKttk.Label(self.generateTab) self.generateHeader.config(style = 'tabHeader.TLabel') self.generateHeader.config(text = 'GENERATOR CSV') - self.generateHeader.pack(fill = TK.X) + self.generateHeader.pack(fill = GUI.R('headerFill')) # Zawartość self.generateFrame = TKttk.Frame(self.generateTab) - self.generateFrame.config(style = 'tabFrame.TFrame') - self.generateFrame.pack(fill = TK.BOTH, expand = 1, padx = GUI.R()['tabFramePadding'], pady = GUI.R()['tabFramePadding']) + self.generateFrame.config(style = 'contentTabFrame.TFrame') + self.generateFrame.pack(fill = GUI.R('contentTabFrameFill'), expand = GUI.R('contentTabFrameExpand'), padx = GUI.R('tabFramePadding'), pady = GUI.R('tabFramePadding')) # (1) Pliki ################################################# @@ -1157,20 +947,20 @@ class mainWindow: self.generateInputFilesFrame = TKttk.Frame(self.generateFilesFrame) self.generateInputFilesFrame.config(style = 'layoutFrame.TFrame') - self.generateInputFilesFrame.pack(fill = TK.BOTH, expand = 1, padx = 6) + self.generateInputFilesFrame.pack(fill = TK.BOTH, expand = 1, padx = GUI.R('outsidelayoutFramesPadX')) # (3) Plik źródłowy 1 ################### self.GIF1Frame = TKttk.Frame(self.generateInputFilesFrame) self.GIF1Frame.config(style = 'layoutFrame.TFrame') - self.GIF1Frame.pack(fill = TK.X, expand = 1, pady = int((GUI.R()['GIFFrameSeparators'])/2)) + self.GIF1Frame.pack(fill = TK.X, expand = 1, pady = int((GUI.R('GIFFrameSeparators')/2))) # "Plik źródłowy (1)" self.GIF1Label = TKttk.Label(self.GIF1Frame) self.GIF1Label.config(style = 'label1.TLabel') - self.GIF1Label.config(width = GUI.R()['generateFilesLabelWidth']) - self.GIF1Label.config(anchor = GUI.R()['generateFilesLabelAnchor']) - self.GIF1Label.config(padding = ('0 0 %s 0' % str(2 * GUI.R()['generateInputFilesPadding']))) + self.GIF1Label.config(width = GUI.R('generateFilesLabelWidth')) + self.GIF1Label.config(anchor = GUI.R('generateFilesLabelAnchor')) + self.GIF1Label.config(padding = ('0 0 %s 0' % str(2 * GUI.R('generateInputFilesPadding')))) self.GIF1Label.config(text = 'Plik źródłowy (1)') self.GIF1Label.pack(side = TK.LEFT) @@ -1182,45 +972,45 @@ class mainWindow: # Lokalizacja self.GIF1SLocalizationFrame = TKttk.Frame(self.GIF1SFrame) self.GIF1SLocalizationFrame.config(style = 'layoutFrame.TFrame') - self.GIF1SLocalizationFrame.pack(side = TK.TOP, fill = TK.X, expand = 1, pady = GUI.R()['generateInputFilesPadding']) + self.GIF1SLocalizationFrame.pack(side = TK.TOP, fill = TK.X, expand = 1, pady = GUI.R('generateInputFilesPadding')) # Lokalizacja - Entry self.GIF1SLocalizationEntryVar = TK.StringVar() self.GIF1SLocalizationEntry = TKttk.Entry(self.GIF1SLocalizationFrame) self.GIF1SLocalizationEntry.config(style = 'entry1.TEntry') self.GIF1SLocalizationEntry.config(textvariable = self.GIF1SLocalizationEntryVar) - self.GIF1SLocalizationEntry.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R()['generateInputFilesPadding']) + self.GIF1SLocalizationEntry.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R('generateInputFilesPadding')) # Lokalizacja - Button self.GIF1SLocalizationButton = TKttk.Button(self.GIF1SLocalizationFrame) self.GIF1SLocalizationButton.config(style = 'button1.TButton') self.GIF1SLocalizationButton.config(text = 'Przeglądaj') self.GIF1SLocalizationButton.config(command = self.GIF1SLocalizationButtonAction) - self.GIF1SLocalizationButton.pack(side = TK.RIGHT, padx = GUI.R()['generateInputFilesPadding']) + self.GIF1SLocalizationButton.pack(side = TK.RIGHT, padx = GUI.R('generateInputFilesPadding')) # Format self.GIF1SFormatFrame = TKttk.Frame(self.GIF1SFrame) self.GIF1SFormatFrame.config(style = 'layoutFrame.TFrame') - self.GIF1SFormatFrame.pack(side = TK.BOTTOM, fill = TK.X, expand = 1, pady = GUI.R()['generateInputFilesPadding']) + self.GIF1SFormatFrame.pack(side = TK.BOTTOM, fill = TK.X, expand = 1, pady = GUI.R('generateInputFilesPadding')) # Format - Label self.GIF1SFormatLabel = TKttk.Label(self.GIF1SFormatFrame) self.GIF1SFormatLabel.config(style = 'label2.TLabel') self.GIF1SFormatLabel.config(text = 'Format') - self.GIF1SFormatLabel.pack(side = TK.LEFT, padx = GUI.R()['generateInputFilesPadding']) + self.GIF1SFormatLabel.pack(side = TK.LEFT, padx = GUI.R('generateInputFilesPadding')) # Format - Combobox self.GIF1SFormatComboboxVar = TK.StringVar() self.GIF1SFormatCombobox = TKttk.Combobox(self.GIF1SFormatFrame) self.GIF1SFormatCombobox.config(style = 'combobox1.TCombobox') - self.GIF1SFormatCombobox.option_add("*TCombobox*Listbox.background", GUI.R()['combobox1ListBoxBackground']) - self.GIF1SFormatCombobox.option_add("*TCombobox*Listbox.foreground", GUI.R()['combobox1ListBoxForeground']) - self.GIF1SFormatCombobox.option_add("*TCombobox*Listbox.selectBackground", GUI.R()['combobox1ListBoxSelectBackground']) - self.GIF1SFormatCombobox.option_add("*TCombobox*Listbox.selectForeground", GUI.R()['combobox1ListBoxSelectForeground']) + self.GIF1SFormatCombobox.option_add("*TCombobox*Listbox.background", GUI.R('combobox1ListBoxBackground')) + self.GIF1SFormatCombobox.option_add("*TCombobox*Listbox.foreground", GUI.R('combobox1ListBoxForeground')) + self.GIF1SFormatCombobox.option_add("*TCombobox*Listbox.selectBackground", GUI.R('combobox1ListBoxSelectBackground')) + self.GIF1SFormatCombobox.option_add("*TCombobox*Listbox.selectForeground", GUI.R('combobox1ListBoxSelectForeground')) self.GIF1SFormatCombobox.config(state = 'readonly') self.GIF1SFormatCombobox.config(textvariable = self.GIF1SFormatComboboxVar) self.GIF1SFormatCombobox['values'] = tuple(FMT.getList()) - self.GIF1SFormatCombobox.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R()['generateInputFilesPadding']) + self.GIF1SFormatCombobox.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R('generateInputFilesPadding')) ######################################### @@ -1228,15 +1018,15 @@ class mainWindow: self.GIF2Frame = TKttk.Frame(self.generateInputFilesFrame) self.GIF2Frame.config(style = 'layoutFrame.TFrame') - self.GIF2Frame.pack(fill = TK.X, expand = 1, pady = int((GUI.R()['GIFFrameSeparators'])/2)) + self.GIF2Frame.pack(fill = TK.X, expand = 1, pady = int((GUI.R('GIFFrameSeparators')/2))) - # "Plik źródłowy (2)" + # "Plik źródłowy (1)" self.GIF2Label = TKttk.Label(self.GIF2Frame) self.GIF2Label.config(style = 'label1.TLabel') - self.GIF2Label.config(width = GUI.R()['generateFilesLabelWidth']) - self.GIF2Label.config(anchor = GUI.R()['generateFilesLabelAnchor']) - self.GIF2Label.config(padding = ('0 0 %s 0' % str(2 * GUI.R()['generateInputFilesPadding']))) - self.GIF2Label.config(text = 'Plik źródłowy (2)') + self.GIF2Label.config(width = GUI.R('generateFilesLabelWidth')) + self.GIF2Label.config(anchor = GUI.R('generateFilesLabelAnchor')) + self.GIF2Label.config(padding = ('0 0 %s 0' % str(2 * GUI.R('generateInputFilesPadding')))) + self.GIF2Label.config(text = 'Plik źródłowy (1)') self.GIF2Label.pack(side = TK.LEFT) # Plik żródłowy (1) - Ustawienia @@ -1247,45 +1037,45 @@ class mainWindow: # Lokalizacja self.GIF2SLocalizationFrame = TKttk.Frame(self.GIF2SFrame) self.GIF2SLocalizationFrame.config(style = 'layoutFrame.TFrame') - self.GIF2SLocalizationFrame.pack(side = TK.TOP, fill = TK.X, expand = 1, pady = GUI.R()['generateInputFilesPadding']) + self.GIF2SLocalizationFrame.pack(side = TK.TOP, fill = TK.X, expand = 1, pady = GUI.R('generateInputFilesPadding')) # Lokalizacja - Entry self.GIF2SLocalizationEntryVar = TK.StringVar() self.GIF2SLocalizationEntry = TKttk.Entry(self.GIF2SLocalizationFrame) self.GIF2SLocalizationEntry.config(style = 'entry1.TEntry') self.GIF2SLocalizationEntry.config(textvariable = self.GIF2SLocalizationEntryVar) - self.GIF2SLocalizationEntry.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R()['generateInputFilesPadding']) + self.GIF2SLocalizationEntry.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R('generateInputFilesPadding')) # Lokalizacja - Button self.GIF2SLocalizationButton = TKttk.Button(self.GIF2SLocalizationFrame) self.GIF2SLocalizationButton.config(style = 'button1.TButton') self.GIF2SLocalizationButton.config(text = 'Przeglądaj') self.GIF2SLocalizationButton.config(command = self.GIF2SLocalizationButtonAction) - self.GIF2SLocalizationButton.pack(side = TK.RIGHT, padx = GUI.R()['generateInputFilesPadding']) + self.GIF2SLocalizationButton.pack(side = TK.RIGHT, padx = GUI.R('generateInputFilesPadding')) # Format self.GIF2SFormatFrame = TKttk.Frame(self.GIF2SFrame) self.GIF2SFormatFrame.config(style = 'layoutFrame.TFrame') - self.GIF2SFormatFrame.pack(side = TK.BOTTOM, fill = TK.X, expand = 1, pady = GUI.R()['generateInputFilesPadding']) + self.GIF2SFormatFrame.pack(side = TK.BOTTOM, fill = TK.X, expand = 1, pady = GUI.R('generateInputFilesPadding')) # Format - Label self.GIF2SFormatLabel = TKttk.Label(self.GIF2SFormatFrame) self.GIF2SFormatLabel.config(style = 'label2.TLabel') self.GIF2SFormatLabel.config(text = 'Format') - self.GIF2SFormatLabel.pack(side = TK.LEFT, padx = GUI.R()['generateInputFilesPadding']) + self.GIF2SFormatLabel.pack(side = TK.LEFT, padx = GUI.R('generateInputFilesPadding')) # Format - Combobox self.GIF2SFormatComboboxVar = TK.StringVar() self.GIF2SFormatCombobox = TKttk.Combobox(self.GIF2SFormatFrame) self.GIF2SFormatCombobox.config(style = 'combobox1.TCombobox') - self.GIF2SFormatCombobox.option_add("*TCombobox*Listbox.background", GUI.R()['combobox1ListBoxBackground']) - self.GIF2SFormatCombobox.option_add("*TCombobox*Listbox.foreground", GUI.R()['combobox1ListBoxForeground']) - self.GIF2SFormatCombobox.option_add("*TCombobox*Listbox.selectBackground", GUI.R()['combobox1ListBoxSelectBackground']) - self.GIF2SFormatCombobox.option_add("*TCombobox*Listbox.selectForeground", GUI.R()['combobox1ListBoxSelectForeground']) + self.GIF2SFormatCombobox.option_add("*TCombobox*Listbox.background", GUI.R('combobox1ListBoxBackground')) + self.GIF2SFormatCombobox.option_add("*TCombobox*Listbox.foreground", GUI.R('combobox1ListBoxForeground')) + self.GIF2SFormatCombobox.option_add("*TCombobox*Listbox.selectBackground", GUI.R('combobox1ListBoxSelectBackground')) + self.GIF2SFormatCombobox.option_add("*TCombobox*Listbox.selectForeground", GUI.R('combobox1ListBoxSelectForeground')) self.GIF2SFormatCombobox.config(state = 'readonly') self.GIF2SFormatCombobox.config(textvariable = self.GIF2SFormatComboboxVar) self.GIF2SFormatCombobox['values'] = tuple(FMT.getList()) - self.GIF2SFormatCombobox.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R()['generateInputFilesPadding']) + self.GIF2SFormatCombobox.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R('generateInputFilesPadding')) ######################################### @@ -1293,15 +1083,15 @@ class mainWindow: self.GIF3Frame = TKttk.Frame(self.generateInputFilesFrame) self.GIF3Frame.config(style = 'layoutFrame.TFrame') - self.GIF3Frame.pack(fill = TK.X, expand = 1, pady = int((GUI.R()['GIFFrameSeparators'])/2)) + self.GIF3Frame.pack(fill = TK.X, expand = 1, pady = int((GUI.R('GIFFrameSeparators')/2))) - # "Plik źródłowy (3)" + # "Plik źródłowy (1)" self.GIF3Label = TKttk.Label(self.GIF3Frame) self.GIF3Label.config(style = 'label1.TLabel') - self.GIF3Label.config(width = GUI.R()['generateFilesLabelWidth']) - self.GIF3Label.config(anchor = GUI.R()['generateFilesLabelAnchor']) - self.GIF3Label.config(padding = ('0 0 %s 0' % str(2 * GUI.R()['generateInputFilesPadding']))) - self.GIF3Label.config(text = 'Plik źródłowy (3)') + self.GIF3Label.config(width = GUI.R('generateFilesLabelWidth')) + self.GIF3Label.config(anchor = GUI.R('generateFilesLabelAnchor')) + self.GIF3Label.config(padding = ('0 0 %s 0' % str(2 * GUI.R('generateInputFilesPadding')))) + self.GIF3Label.config(text = 'Plik źródłowy (1)') self.GIF3Label.pack(side = TK.LEFT) # Plik żródłowy (1) - Ustawienia @@ -1312,45 +1102,45 @@ class mainWindow: # Lokalizacja self.GIF3SLocalizationFrame = TKttk.Frame(self.GIF3SFrame) self.GIF3SLocalizationFrame.config(style = 'layoutFrame.TFrame') - self.GIF3SLocalizationFrame.pack(side = TK.TOP, fill = TK.X, expand = 1, pady = GUI.R()['generateInputFilesPadding']) + self.GIF3SLocalizationFrame.pack(side = TK.TOP, fill = TK.X, expand = 1, pady = GUI.R('generateInputFilesPadding')) # Lokalizacja - Entry self.GIF3SLocalizationEntryVar = TK.StringVar() self.GIF3SLocalizationEntry = TKttk.Entry(self.GIF3SLocalizationFrame) self.GIF3SLocalizationEntry.config(style = 'entry1.TEntry') self.GIF3SLocalizationEntry.config(textvariable = self.GIF3SLocalizationEntryVar) - self.GIF3SLocalizationEntry.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R()['generateInputFilesPadding']) + self.GIF3SLocalizationEntry.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R('generateInputFilesPadding')) # Lokalizacja - Button self.GIF3SLocalizationButton = TKttk.Button(self.GIF3SLocalizationFrame) self.GIF3SLocalizationButton.config(style = 'button1.TButton') self.GIF3SLocalizationButton.config(text = 'Przeglądaj') self.GIF3SLocalizationButton.config(command = self.GIF3SLocalizationButtonAction) - self.GIF3SLocalizationButton.pack(side = TK.RIGHT, padx = GUI.R()['generateInputFilesPadding']) + self.GIF3SLocalizationButton.pack(side = TK.RIGHT, padx = GUI.R('generateInputFilesPadding')) # Format self.GIF3SFormatFrame = TKttk.Frame(self.GIF3SFrame) self.GIF3SFormatFrame.config(style = 'layoutFrame.TFrame') - self.GIF3SFormatFrame.pack(side = TK.BOTTOM, fill = TK.X, expand = 1, pady = GUI.R()['generateInputFilesPadding']) + self.GIF3SFormatFrame.pack(side = TK.BOTTOM, fill = TK.X, expand = 1, pady = GUI.R('generateInputFilesPadding')) # Format - Label self.GIF3SFormatLabel = TKttk.Label(self.GIF3SFormatFrame) self.GIF3SFormatLabel.config(style = 'label2.TLabel') self.GIF3SFormatLabel.config(text = 'Format') - self.GIF3SFormatLabel.pack(side = TK.LEFT, padx = GUI.R()['generateInputFilesPadding']) + self.GIF3SFormatLabel.pack(side = TK.LEFT, padx = GUI.R('generateInputFilesPadding')) # Format - Combobox self.GIF3SFormatComboboxVar = TK.StringVar() self.GIF3SFormatCombobox = TKttk.Combobox(self.GIF3SFormatFrame) self.GIF3SFormatCombobox.config(style = 'combobox1.TCombobox') - self.GIF3SFormatCombobox.option_add("*TCombobox*Listbox.background", GUI.R()['combobox1ListBoxBackground']) - self.GIF3SFormatCombobox.option_add("*TCombobox*Listbox.foreground", GUI.R()['combobox1ListBoxForeground']) - self.GIF3SFormatCombobox.option_add("*TCombobox*Listbox.selectBackground", GUI.R()['combobox1ListBoxSelectBackground']) - self.GIF3SFormatCombobox.option_add("*TCombobox*Listbox.selectForeground", GUI.R()['combobox1ListBoxSelectForeground']) + self.GIF3SFormatCombobox.option_add("*TCombobox*Listbox.background", GUI.R('combobox1ListBoxBackground')) + self.GIF3SFormatCombobox.option_add("*TCombobox*Listbox.foreground", GUI.R('combobox1ListBoxForeground')) + self.GIF3SFormatCombobox.option_add("*TCombobox*Listbox.selectBackground", GUI.R('combobox1ListBoxSelectBackground')) + self.GIF3SFormatCombobox.option_add("*TCombobox*Listbox.selectForeground", GUI.R('combobox1ListBoxSelectForeground')) self.GIF3SFormatCombobox.config(state = 'readonly') self.GIF3SFormatCombobox.config(textvariable = self.GIF3SFormatComboboxVar) self.GIF3SFormatCombobox['values'] = tuple(FMT.getList()) - self.GIF3SFormatCombobox.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R()['generateInputFilesPadding']) + self.GIF3SFormatCombobox.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R('generateInputFilesPadding')) ######################################### @@ -1358,15 +1148,15 @@ class mainWindow: self.GIF4Frame = TKttk.Frame(self.generateInputFilesFrame) self.GIF4Frame.config(style = 'layoutFrame.TFrame') - self.GIF4Frame.pack(fill = TK.X, expand = 1, pady = int((GUI.R()['GIFFrameSeparators'])/2)) + self.GIF4Frame.pack(fill = TK.X, expand = 1, pady = int((GUI.R('GIFFrameSeparators')/2))) - # "Plik źródłowy (4)" + # "Plik źródłowy (1)" self.GIF4Label = TKttk.Label(self.GIF4Frame) self.GIF4Label.config(style = 'label1.TLabel') - self.GIF4Label.config(width = GUI.R()['generateFilesLabelWidth']) - self.GIF4Label.config(anchor = GUI.R()['generateFilesLabelAnchor']) - self.GIF4Label.config(padding = ('0 0 %s 0' % str(2 * GUI.R()['generateInputFilesPadding']))) - self.GIF4Label.config(text = 'Plik źródłowy (4)') + self.GIF4Label.config(width = GUI.R('generateFilesLabelWidth')) + self.GIF4Label.config(anchor = GUI.R('generateFilesLabelAnchor')) + self.GIF4Label.config(padding = ('0 0 %s 0' % str(2 * GUI.R('generateInputFilesPadding')))) + self.GIF4Label.config(text = 'Plik źródłowy (1)') self.GIF4Label.pack(side = TK.LEFT) # Plik żródłowy (1) - Ustawienia @@ -1377,45 +1167,45 @@ class mainWindow: # Lokalizacja self.GIF4SLocalizationFrame = TKttk.Frame(self.GIF4SFrame) self.GIF4SLocalizationFrame.config(style = 'layoutFrame.TFrame') - self.GIF4SLocalizationFrame.pack(side = TK.TOP, fill = TK.X, expand = 1, pady = GUI.R()['generateInputFilesPadding']) + self.GIF4SLocalizationFrame.pack(side = TK.TOP, fill = TK.X, expand = 1, pady = GUI.R('generateInputFilesPadding')) # Lokalizacja - Entry self.GIF4SLocalizationEntryVar = TK.StringVar() self.GIF4SLocalizationEntry = TKttk.Entry(self.GIF4SLocalizationFrame) self.GIF4SLocalizationEntry.config(style = 'entry1.TEntry') self.GIF4SLocalizationEntry.config(textvariable = self.GIF4SLocalizationEntryVar) - self.GIF4SLocalizationEntry.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R()['generateInputFilesPadding']) + self.GIF4SLocalizationEntry.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R('generateInputFilesPadding')) # Lokalizacja - Button self.GIF4SLocalizationButton = TKttk.Button(self.GIF4SLocalizationFrame) self.GIF4SLocalizationButton.config(style = 'button1.TButton') self.GIF4SLocalizationButton.config(text = 'Przeglądaj') self.GIF4SLocalizationButton.config(command = self.GIF4SLocalizationButtonAction) - self.GIF4SLocalizationButton.pack(side = TK.RIGHT, padx = GUI.R()['generateInputFilesPadding']) + self.GIF4SLocalizationButton.pack(side = TK.RIGHT, padx = GUI.R('generateInputFilesPadding')) # Format self.GIF4SFormatFrame = TKttk.Frame(self.GIF4SFrame) self.GIF4SFormatFrame.config(style = 'layoutFrame.TFrame') - self.GIF4SFormatFrame.pack(side = TK.BOTTOM, fill = TK.X, expand = 1, pady = GUI.R()['generateInputFilesPadding']) + self.GIF4SFormatFrame.pack(side = TK.BOTTOM, fill = TK.X, expand = 1, pady = GUI.R('generateInputFilesPadding')) # Format - Label self.GIF4SFormatLabel = TKttk.Label(self.GIF4SFormatFrame) self.GIF4SFormatLabel.config(style = 'label2.TLabel') self.GIF4SFormatLabel.config(text = 'Format') - self.GIF4SFormatLabel.pack(side = TK.LEFT, padx = GUI.R()['generateInputFilesPadding']) + self.GIF4SFormatLabel.pack(side = TK.LEFT, padx = GUI.R('generateInputFilesPadding')) # Format - Combobox self.GIF4SFormatComboboxVar = TK.StringVar() self.GIF4SFormatCombobox = TKttk.Combobox(self.GIF4SFormatFrame) self.GIF4SFormatCombobox.config(style = 'combobox1.TCombobox') - self.GIF4SFormatCombobox.option_add("*TCombobox*Listbox.background", GUI.R()['combobox1ListBoxBackground']) - self.GIF4SFormatCombobox.option_add("*TCombobox*Listbox.foreground", GUI.R()['combobox1ListBoxForeground']) - self.GIF4SFormatCombobox.option_add("*TCombobox*Listbox.selectBackground", GUI.R()['combobox1ListBoxSelectBackground']) - self.GIF4SFormatCombobox.option_add("*TCombobox*Listbox.selectForeground", GUI.R()['combobox1ListBoxSelectForeground']) + self.GIF4SFormatCombobox.option_add("*TCombobox*Listbox.background", GUI.R('combobox1ListBoxBackground')) + self.GIF4SFormatCombobox.option_add("*TCombobox*Listbox.foreground", GUI.R('combobox1ListBoxForeground')) + self.GIF4SFormatCombobox.option_add("*TCombobox*Listbox.selectBackground", GUI.R('combobox1ListBoxSelectBackground')) + self.GIF4SFormatCombobox.option_add("*TCombobox*Listbox.selectForeground", GUI.R('combobox1ListBoxSelectForeground')) self.GIF4SFormatCombobox.config(state = 'readonly') self.GIF4SFormatCombobox.config(textvariable = self.GIF4SFormatComboboxVar) self.GIF4SFormatCombobox['values'] = tuple(FMT.getList()) - self.GIF4SFormatCombobox.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R()['generateInputFilesPadding']) + self.GIF4SFormatCombobox.pack(side = TK.LEFT, expand = 1, fill = TK.X, padx = GUI.R('generateInputFilesPadding')) ######################################### @@ -1425,7 +1215,8 @@ class mainWindow: self.generateSeparator1 = TKttk.Separator(self.generateFilesFrame) self.generateSeparator1.config(style = 'separator1.TSeparator') - self.generateSeparator1.pack(fill = TK.X, pady = 10) + self.generateSeparator1.config(orient = TK.HORIZONTAL) + self.generateSeparator1.pack(fill = TK.X, pady = GUI.R('generateHorizontalSeparatorPadY')) ################################################### @@ -1433,19 +1224,19 @@ class mainWindow: self.generateOutputFilesFrame = TKttk.Frame(self.generateFilesFrame) self.generateOutputFilesFrame.config(style = 'layoutFrame.TFrame') - self.generateOutputFilesFrame.pack(fill = TK.X, pady = 10, padx = 12) + self.generateOutputFilesFrame.pack(fill = TK.X, padx = GUI.R('outsidelayoutFramesPadX')) # (3) Poczta ############################ self.GOFMailFrame = TKttk.Frame(self.generateOutputFilesFrame) self.GOFMailFrame.config(style = 'layoutFrame.TFrame') - self.GOFMailFrame.pack(pady = GUI.R()['generateOutputFilesPadding'], fill = TK.X, expand = 1) + self.GOFMailFrame.pack(pady = GUI.R('generateOutputFilesPadding'), fill = TK.X, expand = 1) # "Poczta" self.GOFMailLabel = TKttk.Label(self.GOFMailFrame) self.GOFMailLabel.config(style = 'label1.TLabel') - self.GOFMailLabel.config(width = GUI.R()['generateFilesLabelWidth']) - self.GOFMailLabel.config(anchor = GUI.R()['generateFilesLabelAnchor']) + self.GOFMailLabel.config(width = GUI.R('generateFilesLabelWidth')) + self.GOFMailLabel.config(anchor = GUI.R('generateFilesLabelAnchor')) self.GOFMailLabel.config(text = 'Poczta') self.GOFMailLabel.pack(side = TK.LEFT) @@ -1454,7 +1245,7 @@ class mainWindow: self.GOFMailEntry = TKttk.Entry(self.GOFMailFrame) self.GOFMailEntry.config(style = 'entry1.TEntry') self.GOFMailEntry.config(textvariable = self.GOFMailEntryVar) - self.GOFMailEntry.pack(padx = 2 * GUI.R()['generateOutputFilesPadding'], side = TK.LEFT, fill = TK.X, expand = 1) + self.GOFMailEntry.pack(padx = 2 * GUI.R('generateOutputFilesPadding'), side = TK.LEFT, fill = TK.X, expand = 1) # Plik poczty - Lokalizacja (Button) self.GOFMailButton = TKttk.Button(self.GOFMailFrame) @@ -1469,13 +1260,13 @@ class mainWindow: self.GOFOfficeFrame = TKttk.Frame(self.generateOutputFilesFrame) self.GOFOfficeFrame.config(style = 'layoutFrame.TFrame') - self.GOFOfficeFrame.pack(pady = GUI.R()['generateOutputFilesPadding'], fill = TK.X, expand = 1) + self.GOFOfficeFrame.pack(pady = GUI.R('generateOutputFilesPadding'), fill = TK.X, expand = 1) # "Office" self.GOFOfficeLabel = TKttk.Label(self.GOFOfficeFrame) self.GOFOfficeLabel.config(style = 'label1.TLabel') - self.GOFOfficeLabel.config(width = GUI.R()['generateFilesLabelWidth']) - self.GOFOfficeLabel.config(anchor = GUI.R()['generateFilesLabelAnchor']) + self.GOFOfficeLabel.config(width = GUI.R('generateFilesLabelWidth')) + self.GOFOfficeLabel.config(anchor = GUI.R('generateFilesLabelAnchor')) self.GOFOfficeLabel.config(text = 'Office') self.GOFOfficeLabel.pack(side = TK.LEFT) @@ -1484,7 +1275,7 @@ class mainWindow: self.GOFOfficeEntry = TKttk.Entry(self.GOFOfficeFrame) self.GOFOfficeEntry.config(style = 'entry1.TEntry') self.GOFOfficeEntry.config(textvariable = self.GOFOfficeEntryVar) - self.GOFOfficeEntry.pack(padx = 2 * GUI.R()['generateOutputFilesPadding'], side = TK.LEFT, fill = TK.X, expand = 1) + self.GOFOfficeEntry.pack(padx = 2 * GUI.R('generateOutputFilesPadding'), side = TK.LEFT, fill = TK.X, expand = 1) # Plik office - Lokalizacja (Button) self.GOFOfficeButton = TKttk.Button(self.GOFOfficeFrame) @@ -1503,7 +1294,8 @@ class mainWindow: self.generateSeparator2 = TKttk.Separator(self.generateFrame) self.generateSeparator2.config(style = 'separator1.TSeparator') - self.generateSeparator2.pack(fill = TK.X, pady = 10) + self.generateSeparator2.config(orient = TK.HORIZONTAL) + self.generateSeparator2.pack(fill = TK.X, pady = GUI.R('generateHorizontalSeparatorPadY')) ############################################################# @@ -1511,15 +1303,15 @@ class mainWindow: self.generateButtonsFrame = TKttk.Frame(self.generateFrame) self.generateButtonsFrame.config(style = 'layoutFrame.TFrame') - self.generateButtonsFrame.pack(fill = TK.X, pady = 10, padx = 12) + self.generateButtonsFrame.pack(fill = TK.X, padx = GUI.R('outsidelayoutFramesPadX')) # Przycisk "START" self.generateStartButton = TKttk.Button(self.generateButtonsFrame) self.generateStartButton.config(style = 'button1.TButton') - self.generateStartButton.config(padding = 10) + self.generateStartButton.config(padding = GUI.R('generateStartButtonPadding')) self.generateStartButton.config(text = 'START') self.generateStartButton.config(command = self.generateStartButtonAction) - self.generateStartButton.pack(side = TK.LEFT, fill = TK.X, expand = 1) + self.generateStartButton.pack(side = TK.LEFT, fill = TK.X, expand = 1, pady = GUI.R('generateStartButtonPadY')) ############################################################## @@ -1532,8 +1324,8 @@ class mainWindow: self.formatTab = TKttk.Frame(self.mainMenu) self.formatTab.config(style = "mainMenuTabFrame.TFrame") - self.formatTabImg = PLimg.open(GUI.R()['formatTabIcon']) - self.formatTabImg = self.formatTabImg.resize((GUI.R()['tabIconsSize'], GUI.R()['tabIconsSize']), PLimg.ANTIALIAS) + self.formatTabImg = PLimg.open(GUI.R('formatTabIcon')) + self.formatTabImg = self.formatTabImg.resize((GUI.R('tabIconsSize'), GUI.R('tabIconsSize')), PLimg.ANTIALIAS) self.formatTabImg = PLitk.PhotoImage(self.formatTabImg) self.mainMenu.add(self.formatTab, image = self.formatTabImg, state = TK.NORMAL) @@ -1542,20 +1334,20 @@ class mainWindow: self.formatHeader = TKttk.Label(self.formatTab) self.formatHeader.config(style = 'tabHeader.TLabel') self.formatHeader.config(text = 'FORMAT DANYCH') - self.formatHeader.pack(fill = TK.X) + self.formatHeader.pack(fill = GUI.R('headerFill')) # Zawartość self.formatFrame = TKttk.Frame(self.formatTab) - self.formatFrame.config(style = 'tabFrame.TFrame') - self.formatFrame.pack(fill = TK.BOTH, expand = 1, padx = GUI.R()['tabFramePadding'], pady = GUI.R()['tabFramePadding']) - + self.formatFrame.config(style = 'contentTabFrame.TFrame') + self.formatFrame.pack(fill = GUI.R('contentTabFrameFill'), expand = GUI.R('contentTabFrameExpand'), padx = GUI.R('tabFramePadding'), pady = GUI.R('tabFramePadding')) + # (1) Ładowanie presetu ##################################### self.loadingPresetFrame = TKttk.Frame(self.formatFrame) self.loadingPresetFrame.config(style = 'layoutFrame.TFrame') - self.loadingPresetFrame.pack(fill = TK.X, side = TK.TOP, pady = 5, padx = 10) + self.loadingPresetFrame.pack(fill = TK.X, side = TK.TOP, padx = GUI.R('outsidelayoutFramesPadX'))#, pady = 5, padx = 10) # "Wybierz preset do edycji lub wpisz nazwę nowego" self.loadingListLabel = TKttk.Label(self.loadingPresetFrame) @@ -1568,18 +1360,18 @@ class mainWindow: self.loadingList = TKttk.Combobox(self.loadingPresetFrame) self.loadingList.config(textvariable = self.loadingListVar) self.loadingList.config(style = 'combobox2.TCombobox') - self.loadingList.option_add("*TCombobox*Listbox.background", GUI.R()['combobox2ListBoxBackground']) - self.loadingList.option_add("*TCombobox*Listbox.foreground", GUI.R()['combobox2ListBoxForeground']) - self.loadingList.option_add("*TCombobox*Listbox.selectBackground", GUI.R()['combobox2ListBoxSelectBackground']) - self.loadingList.option_add("*TCombobox*Listbox.selectForeground", GUI.R()['combobox2ListBoxSelectForeground']) - self.loadingList.pack(side = TK.LEFT, padx = GUI.R()['loadingListPadX'], fill = TK.X, expand = 1) + self.loadingList.option_add("*TCombobox*Listbox.background", GUI.R('combobox2ListBoxBackground')) + self.loadingList.option_add("*TCombobox*Listbox.foreground", GUI.R('combobox2ListBoxForeground')) + self.loadingList.option_add("*TCombobox*Listbox.selectBackground", GUI.R('combobox2ListBoxSelectBackground')) + self.loadingList.option_add("*TCombobox*Listbox.selectForeground", GUI.R('combobox2ListBoxSelectForeground')) + self.loadingList.pack(side = TK.LEFT, padx = GUI.R('loadingListPadX'), fill = TK.X, expand = 1) self.loadingList['values'] = tuple(FMT.getList()) # Przycisk "WCZYTAJ" self.loadingButton = TKttk.Button(self.loadingPresetFrame) self.loadingButton.config(style = 'button1.TButton') self.loadingButton.config(command = self.loadingButtonAction) - self.loadingButton.config(width = GUI.R()['loadingButtonWidth']) + self.loadingButton.config(width = GUI.R('loadingButtonWidth')) self.loadingButton.config(text = 'WCZYTAJ') self.loadingButton.pack(side = TK.RIGHT) @@ -1590,7 +1382,7 @@ class mainWindow: self.formatSeparator1 = TKttk.Separator(self.formatFrame) self.formatSeparator1.config(style = 'separator1.TSeparator') self.formatSeparator1.config(orient = TK.HORIZONTAL) - self.formatSeparator1.pack(fill = TK.X, pady = 10) + self.formatSeparator1.pack(fill = TK.X, pady = GUI.R('formatHorizontalSeparatorPadY')) ############################################################# @@ -1598,8 +1390,8 @@ class mainWindow: self.editingPresetFrame = TKttk.Frame(self.formatFrame) self.editingPresetFrame.config(style = 'layoutFrame.TFrame') - self.editingPresetFrame.pack(fill = TK.BOTH, expand = 1, padx = 10) - + self.editingPresetFrame.pack(fill = TK.BOTH, expand = 1, padx = GUI.R('outsidelayoutFramesPadX')) + # (2) Ustawienia ################################## self.editingPresetSettingsFrame = TKttk.Frame(self.editingPresetFrame) @@ -1611,18 +1403,18 @@ class mainWindow: self.editingPresetOSFrame = TKttk.Frame(self.editingPresetSettingsFrame) self.editingPresetOSFrame.config(style = 'layoutFrame.TFrame') self.editingPresetOSFrame.pack(fill = TK.BOTH, expand = 1, side = TK.LEFT) - + # (5) Typ osoby ############### self.EPOSTypeFrame = TKttk.Frame(self.editingPresetOSFrame) self.EPOSTypeFrame.config(style = 'layoutFrame.TFrame') - self.EPOSTypeFrame.pack(fill = TK.X, expand = 1, pady = 5) + self.EPOSTypeFrame.pack(fill = TK.X, expand = 1, pady = GUI.R('EPOSTypeFramePadY')) # "Typ osoby" self.EPOSTypeLabel = TKttk.Label(self.EPOSTypeFrame) self.EPOSTypeLabel.config(style = 'label1.TLabel') - self.EPOSTypeLabel.config(width = GUI.R()['EPOSLabelWidth']) - self.EPOSTypeLabel.config(anchor = GUI.R()['EPOSLabelAnchor']) + self.EPOSTypeLabel.config(width = GUI.R('EPOSLabelWidth')) + self.EPOSTypeLabel.config(anchor = GUI.R('EPOSLabelAnchor')) self.EPOSTypeLabel.config(text = 'Typ osoby') self.EPOSTypeLabel.pack(side = TK.LEFT) @@ -1630,11 +1422,11 @@ class mainWindow: self.EPOSTypeVar = TK.BooleanVar(value = True) self.EPOSTypeStudentRadiobutton = TK.Radiobutton(self.EPOSTypeFrame) - self.EPOSTypeStudentRadiobutton.config(background = GUI.R()['radiobutton1Background']) - self.EPOSTypeStudentRadiobutton.config(foreground = GUI.R()['radiobutton1TextColor']) - self.EPOSTypeStudentRadiobutton.config(selectcolor = GUI.R()['radiobutton1IndicatorBackground']) - self.EPOSTypeStudentRadiobutton.config(activebackground = GUI.R()['radiobutton1Background']) - self.EPOSTypeStudentRadiobutton.config(activeforeground = GUI.R()['radiobutton1TextColor']) + self.EPOSTypeStudentRadiobutton.config(background = GUI.R('radiobutton1Background')) + self.EPOSTypeStudentRadiobutton.config(foreground = GUI.R('radiobutton1TextColor')) + self.EPOSTypeStudentRadiobutton.config(selectcolor = GUI.R('radiobutton1IndicatorBackground')) + self.EPOSTypeStudentRadiobutton.config(activebackground = GUI.R('radiobutton1Background')) + self.EPOSTypeStudentRadiobutton.config(activeforeground = GUI.R('radiobutton1TextColor')) self.EPOSTypeStudentRadiobutton.config(variable = self.EPOSTypeVar) self.EPOSTypeStudentRadiobutton.config(value = True) self.EPOSTypeStudentRadiobutton.config(state = TK.DISABLED) @@ -1642,11 +1434,11 @@ class mainWindow: self.EPOSTypeStudentRadiobutton.pack(side = TK.RIGHT, fill = TK.X, expand = 1) self.EPOSTypeTeacherRadiobutton = TK.Radiobutton(self.EPOSTypeFrame) - self.EPOSTypeTeacherRadiobutton.config(background = GUI.R()['radiobutton1Background']) - self.EPOSTypeTeacherRadiobutton.config(foreground = GUI.R()['radiobutton1TextColor']) - self.EPOSTypeTeacherRadiobutton.config(selectcolor = GUI.R()['radiobutton1IndicatorBackground']) - self.EPOSTypeTeacherRadiobutton.config(activebackground = GUI.R()['radiobutton1Background']) - self.EPOSTypeTeacherRadiobutton.config(activeforeground = GUI.R()['radiobutton1TextColor']) + self.EPOSTypeTeacherRadiobutton.config(background = GUI.R('radiobutton1Background')) + self.EPOSTypeTeacherRadiobutton.config(foreground = GUI.R('radiobutton1TextColor')) + self.EPOSTypeTeacherRadiobutton.config(selectcolor = GUI.R('radiobutton1IndicatorBackground')) + self.EPOSTypeTeacherRadiobutton.config(activebackground = GUI.R('radiobutton1Background')) + self.EPOSTypeTeacherRadiobutton.config(activeforeground = GUI.R('radiobutton1TextColor')) self.EPOSTypeTeacherRadiobutton.config(variable = self.EPOSTypeVar) self.EPOSTypeTeacherRadiobutton.config(value = False) self.EPOSTypeTeacherRadiobutton.config(state = TK.DISABLED) @@ -1659,13 +1451,13 @@ class mainWindow: self.EPOSPersonSeparatorFrame = TKttk.Frame(self.editingPresetOSFrame) self.EPOSPersonSeparatorFrame.config(style = 'layoutFrame.TFrame') - self.EPOSPersonSeparatorFrame.pack(fill = TK.X, expand = 1, pady = 5) + self.EPOSPersonSeparatorFrame.pack(fill = TK.X, expand = 1, pady = GUI.R('EPOSPersonSeparatorFramePadY')) # "Separator pomiędzy osobami" self.EPOSPersonSeparatorLabel = TKttk.Label(self.EPOSPersonSeparatorFrame) self.EPOSPersonSeparatorLabel.config(style = 'label1.TLabel') - self.EPOSPersonSeparatorLabel.config(width = GUI.R()['EPOSLabelWidth']) - self.EPOSPersonSeparatorLabel.config(anchor = GUI.R()['EPOSLabelAnchor']) + self.EPOSPersonSeparatorLabel.config(width = GUI.R('EPOSLabelWidth')) + self.EPOSPersonSeparatorLabel.config(anchor = GUI.R('EPOSLabelAnchor')) self.EPOSPersonSeparatorLabel.config(text = 'Separator pomiędzy osobami') self.EPOSPersonSeparatorLabel.pack(side = TK.LEFT) @@ -1675,7 +1467,6 @@ class mainWindow: self.EPOSPersonSeparatorEntry.config(style = 'entry1.TEntry') self.EPOSPersonSeparatorEntry.config(textvariable = self.EPOSPersonSeparatorVar) self.EPOSPersonSeparatorEntry.config(state = TK.DISABLED) - self.EPOSPersonSeparatorEntry.config(width = GUI.R()['EPOSPersonSeparatorEntryWidth']) self.EPOSPersonSeparatorEntry.pack(side = TK.RIGHT, fill = TK.X, expand = 1) ##################### @@ -1684,13 +1475,13 @@ class mainWindow: self.EPOSRowSeparatorFrame = TKttk.Frame(self.editingPresetOSFrame) self.EPOSRowSeparatorFrame.config(style = 'layoutFrame.TFrame') - self.EPOSRowSeparatorFrame.pack(fill = TK.X, expand = 1, pady = 5) + self.EPOSRowSeparatorFrame.pack(fill = TK.X, expand = 1, pady = GUI.R('EPOSRowSeparatorFramePadY')) # "Separator pomiędzy wierszami" self.EPOSRowSeparatorLabel = TKttk.Label(self.EPOSRowSeparatorFrame) self.EPOSRowSeparatorLabel.config(style = 'label1.TLabel') - self.EPOSRowSeparatorLabel.config(width = GUI.R()['EPOSLabelWidth']) - self.EPOSRowSeparatorLabel.config(anchor = GUI.R()['EPOSLabelAnchor']) + self.EPOSRowSeparatorLabel.config(width = GUI.R('EPOSLabelWidth')) + self.EPOSRowSeparatorLabel.config(anchor = GUI.R('EPOSLabelAnchor')) self.EPOSRowSeparatorLabel.config(text = 'Separator pomiędzy wierszami') self.EPOSRowSeparatorLabel.pack(side = TK.LEFT) @@ -1700,7 +1491,6 @@ class mainWindow: self.EPOSRowSeparatorEntry.config(style = 'entry1.TEntry') self.EPOSRowSeparatorEntry.config(textvariable = self.EPOSRowSeparatorVar) self.EPOSRowSeparatorEntry.config(state = TK.DISABLED) - self.EPOSRowSeparatorEntry.config(width = GUI.R()['EPOSRowSeparatorEntryWidth']) self.EPOSRowSeparatorEntry.pack(side = TK.RIGHT, fill = TK.X, expand = 1) ##################### @@ -1709,63 +1499,63 @@ class mainWindow: self.EPOSDataSeparatorFrame = TKttk.Frame(self.editingPresetOSFrame) self.EPOSDataSeparatorFrame.config(style = 'layoutFrame.TFrame') - self.EPOSDataSeparatorFrame.pack(fill = TK.BOTH, expand = 1, pady = 5) + self.EPOSDataSeparatorFrame.pack(fill = TK.BOTH, expand = 1, pady = GUI.R('EPOSDataSeparatorFramePadY')) # "Separatory pomiędzy danymi" self.EPOSDataSeparatorLabel = TKttk.Label(self.EPOSDataSeparatorFrame) self.EPOSDataSeparatorLabel.config(style = 'label1.TLabel') - self.EPOSDataSeparatorLabel.config(width = GUI.R()['EPOSLabelWidth']) - self.EPOSDataSeparatorLabel.config(anchor = GUI.R()['EPOSLabelAnchor']) + self.EPOSDataSeparatorLabel.config(width = GUI.R('EPOSLabelWidth')) + self.EPOSDataSeparatorLabel.config(anchor = GUI.R('EPOSLabelAnchor')) self.EPOSDataSeparatorLabel.config(text = 'Separatory pomiędzy danymi') self.EPOSDataSeparatorLabel.pack(side = TK.LEFT) # Entry - Separator pomiedzy wierszami self.EPOSDataSeparatorText = TK.Text(self.EPOSDataSeparatorFrame) self.EPOSDataSeparatorText.config(state = TK.DISABLED) - self.EPOSDataSeparatorText.config(background = GUI.R()['text1Background']) - self.EPOSDataSeparatorText.config(foreground = GUI.R()['text1TextColor']) - self.EPOSDataSeparatorText.config(relief = GUI.R()['text1Relief']) + self.EPOSDataSeparatorText.config(background = GUI.R('text1Background')) + self.EPOSDataSeparatorText.config(foreground = GUI.R('text1TextColor')) + self.EPOSDataSeparatorText.config(relief = GUI.R('text1Relief')) self.EPOSDataSeparatorText.pack(side = TK.TOP, fill = TK.BOTH) ##################### - + ############################### - # (4) Separator 2 ############# + # (5) Separator 2 ############# self.formatSeparator2 = TKttk.Separator(self.editingPresetSettingsFrame) self.formatSeparator2.config(style = 'separator1.TSeparator') self.formatSeparator2.config(orient = TK.VERTICAL) - self.formatSeparator2.pack(fill = TK.Y, padx = 12, expand = 1, side = TK.LEFT) + self.formatSeparator2.pack(fill = TK.Y, padx = GUI.R('formatVerticalSeparatorPadY'), side = TK.LEFT) ############################### - # (4) Lokalizacja danych ###### + # (5) Lokalizacja danych ###### self.editingPresetDLFrame = TKttk.Frame(self.editingPresetSettingsFrame) self.editingPresetDLFrame.config(style = 'layoutFrame.TFrame') self.editingPresetDLFrame.pack(fill = TK.BOTH, side = TK.RIGHT) self.editingPresetDLFrame.grid_columnconfigure(1, weight = 1) self.editingPresetDLFrame.grid_columnconfigure(2, weight = 1) - + # C1 - "Wiersz" self.EPDLC1Label = TKttk.Label(self.editingPresetDLFrame) self.EPDLC1Label.config(style = 'label1.TLabel') self.EPDLC1Label.config(text = 'Wiersz') - self.EPDLC1Label.grid(row = 0, column = 1, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLC1Label.grid(row = 0, column = 1, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # C2 - "Pozycja w wierszu" self.EPDLC2Label = TKttk.Label(self.editingPresetDLFrame) self.EPDLC2Label.config(style = 'label1.TLabel') self.EPDLC2Label.config(justify = TK.CENTER) self.EPDLC2Label.config(text = 'Pozycja\nw wierszu') - self.EPDLC2Label.grid(row = 0, column = 2, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLC2Label.grid(row = 0, column = 2, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # W1 - "Login" self.EPDLW1Label = TKttk.Label(self.editingPresetDLFrame) self.EPDLW1Label.config(style = 'label1.TLabel') self.EPDLW1Label.config(text = 'Login') - self.EPDLW1Label.grid(row = 1, column = 0, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLW1Label.grid(row = 1, column = 0, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # Lokalizacja loginu (wiersz) self.EPDLLoginRowVar = TK.IntVar() @@ -1775,7 +1565,7 @@ class mainWindow: self.EPDLLoginRowSpinbox.config(to = 1000000) self.EPDLLoginRowSpinbox.config(state = TK.DISABLED) self.EPDLLoginRowSpinbox.config(style = 'spinbox1.TSpinbox') - self.EPDLLoginRowSpinbox.grid(row = 1, column = 1, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLLoginRowSpinbox.grid(row = 1, column = 1, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # Lokalizacja loginu (pozycja w wierszu) self.EPDLLoginPosInRowVar = TK.IntVar() @@ -1785,13 +1575,13 @@ class mainWindow: self.EPDLLoginPosInRowSpinbox.config(to = 1000000) self.EPDLLoginPosInRowSpinbox.config(state = TK.DISABLED) self.EPDLLoginPosInRowSpinbox.config(style = 'spinbox1.TSpinbox') - self.EPDLLoginPosInRowSpinbox.grid(row = 1, column = 2, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLLoginPosInRowSpinbox.grid(row = 1, column = 2, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # W2 - "Imię" self.EPDLW2Label = TKttk.Label(self.editingPresetDLFrame) self.EPDLW2Label.config(style = 'label1.TLabel') self.EPDLW2Label.config(text = 'Imię') - self.EPDLW2Label.grid(row = 2, column = 0, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLW2Label.grid(row = 2, column = 0, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # Lokalizacja imienia (wiersz) self.EPDLFnameRowVar = TK.IntVar() @@ -1801,7 +1591,7 @@ class mainWindow: self.EPDLFnameRowSpinbox.config(to = 1000000) self.EPDLFnameRowSpinbox.config(state = TK.DISABLED) self.EPDLFnameRowSpinbox.config(style = 'spinbox1.TSpinbox') - self.EPDLFnameRowSpinbox.grid(row = 2, column = 1, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLFnameRowSpinbox.grid(row = 2, column = 1, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # Lokalizacja imienia (pozycja w wierszu) self.EPDLFnamePosInRowVar = TK.IntVar() @@ -1811,13 +1601,13 @@ class mainWindow: self.EPDLFnamePosInRowSpinbox.config(to = 1000000) self.EPDLFnamePosInRowSpinbox.config(state = TK.DISABLED) self.EPDLFnamePosInRowSpinbox.config(style = 'spinbox1.TSpinbox') - self.EPDLFnamePosInRowSpinbox.grid(row = 2, column = 2, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLFnamePosInRowSpinbox.grid(row = 2, column = 2, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # W3 - "Nazwisko" self.EPDLW3Label = TKttk.Label(self.editingPresetDLFrame) self.EPDLW3Label.config(style = 'label1.TLabel') self.EPDLW3Label.config(text = 'Nazwisko') - self.EPDLW3Label.grid(row = 3, column = 0, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLW3Label.grid(row = 3, column = 0, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # Lokalizacja nazwiska (wiersz) self.EPDLLnameRowVar = TK.IntVar() @@ -1827,7 +1617,7 @@ class mainWindow: self.EPDLLnameRowSpinbox.config(to = 1000000) self.EPDLLnameRowSpinbox.config(state = TK.DISABLED) self.EPDLLnameRowSpinbox.config(style = 'spinbox1.TSpinbox') - self.EPDLLnameRowSpinbox.grid(row = 3, column = 1, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLLnameRowSpinbox.grid(row = 3, column = 1, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # Lokalizacja nazwiska (pozycja w wierszu) self.EPDLLnamePosInRowVar = TK.IntVar() @@ -1837,13 +1627,13 @@ class mainWindow: self.EPDLLnamePosInRowSpinbox.config(to = 1000000) self.EPDLLnamePosInRowSpinbox.config(state = TK.DISABLED) self.EPDLLnamePosInRowSpinbox.config(style = 'spinbox1.TSpinbox') - self.EPDLLnamePosInRowSpinbox.grid(row = 3, column = 2, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLLnamePosInRowSpinbox.grid(row = 3, column = 2, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # W4 - "Szkoła" self.EPDLW4Label = TKttk.Label(self.editingPresetDLFrame) self.EPDLW4Label.config(style = 'label1.TLabel') self.EPDLW4Label.config(text = 'Szkoła') - self.EPDLW4Label.grid(row = 4, column = 0, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLW4Label.grid(row = 4, column = 0, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # Lokalizacja nazwiska (wiersz) self.EPDLSchoolRowVar = TK.IntVar() @@ -1853,7 +1643,7 @@ class mainWindow: self.EPDLSchoolRowSpinbox.config(to = 1000000) self.EPDLSchoolRowSpinbox.config(state = TK.DISABLED) self.EPDLSchoolRowSpinbox.config(style = 'spinbox1.TSpinbox') - self.EPDLSchoolRowSpinbox.grid(row = 4, column = 1, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLSchoolRowSpinbox.grid(row = 4, column = 1, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # Lokalizacja nazwiska (pozycja w wierszu) self.EPDLSchoolPosInRowVar = TK.IntVar() @@ -1863,13 +1653,13 @@ class mainWindow: self.EPDLSchoolPosInRowSpinbox.config(to = 1000000) self.EPDLSchoolPosInRowSpinbox.config(state = TK.DISABLED) self.EPDLSchoolPosInRowSpinbox.config(style = 'spinbox1.TSpinbox') - self.EPDLSchoolPosInRowSpinbox.grid(row = 4, column = 2, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLSchoolPosInRowSpinbox.grid(row = 4, column = 2, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # W5 - "Klasa" self.EPDLW5Label = TKttk.Label(self.editingPresetDLFrame) self.EPDLW5Label.config(style = 'label1.TLabel') self.EPDLW5Label.config(text = 'Klasa') - self.EPDLW5Label.grid(row = 5, column = 0, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLW5Label.grid(row = 5, column = 0, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # Lokalizacja nazwiska (wiersz) self.EPDLClassRowVar = TK.IntVar() @@ -1879,7 +1669,7 @@ class mainWindow: self.EPDLClassRowSpinbox.config(to = 1000000) self.EPDLClassRowSpinbox.config(state = TK.DISABLED) self.EPDLClassRowSpinbox.config(style = 'spinbox1.TSpinbox') - self.EPDLClassRowSpinbox.grid(row = 5, column = 1, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLClassRowSpinbox.grid(row = 5, column = 1, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) # Lokalizacja nazwiska (pozycja w wierszu) self.EPDLClassPosInRowVar = TK.IntVar() @@ -1889,20 +1679,20 @@ class mainWindow: self.EPDLClassPosInRowSpinbox.config(to = 1000000) self.EPDLClassPosInRowSpinbox.config(state = TK.DISABLED) self.EPDLClassPosInRowSpinbox.config(style = 'spinbox1.TSpinbox') - self.EPDLClassPosInRowSpinbox.grid(row = 5, column = 2, padx = GUI.R()['EPDataLocalizationPadX'], pady = GUI.R()['EPDataLocalizationPadY']) + self.EPDLClassPosInRowSpinbox.grid(row = 5, column = 2, padx = GUI.R('EPDataLocalizationPadX'), pady = GUI.R('EPDataLocalizationPadY')) ############################### ######################################### ################################################### - + # (1) Separator 3 ########################################### self.formatSeparator3 = TKttk.Separator(self.formatFrame) self.formatSeparator3.config(style = 'separator1.TSeparator') self.formatSeparator3.config(orient = TK.HORIZONTAL) - self.formatSeparator3.pack(fill = TK.X, expand = 1, pady = 6) + self.formatSeparator3.pack(fill = TK.X, pady = GUI.R('formatHorizontalSeparatorPadY')) ############################################################# @@ -1910,14 +1700,14 @@ class mainWindow: self.editingPresetButtonsFrame = TKttk.Frame(self.formatFrame) self.editingPresetButtonsFrame.config(style = 'layoutFrame.TFrame') - self.editingPresetButtonsFrame.pack(fill = TK.X, expand = 1, side = TK.BOTTOM) + self.editingPresetButtonsFrame.pack(fill = TK.X, side = TK.BOTTOM, pady = GUI.R('editingPresetButtonsPadY')) # Przycisk 'ZAPISZ' self.editingPresetSaveButton = TKttk.Button(self.editingPresetButtonsFrame) self.editingPresetSaveButton.config(command = self.editingPresetSaveButtonAction) self.editingPresetSaveButton.config(state = TK.DISABLED) self.editingPresetSaveButton.config(style = 'button1.TButton') - self.editingPresetSaveButton.config(width = GUI.R()['editingPresetSaveButtonWidth']) + self.editingPresetSaveButton.config(width = GUI.R('editingPresetSaveButtonWidth')) self.editingPresetSaveButton.config(text = 'ZAPISZ') self.editingPresetSaveButton.pack(side = TK.LEFT, expand = 1) @@ -1926,7 +1716,7 @@ class mainWindow: self.editingPresetCancelButton.config(command = self.editingPresetCancelButtonAction) self.editingPresetCancelButton.config(state = TK.DISABLED) self.editingPresetCancelButton.config(style = 'button1.TButton') - self.editingPresetCancelButton.config(width = GUI.R()['editingPresetCancelButtonWidth']) + self.editingPresetCancelButton.config(width = GUI.R('editingPresetCancelButtonWidth')) self.editingPresetCancelButton.config(text = 'Anuluj') self.editingPresetCancelButton.pack(side = TK.RIGHT, expand = 1) @@ -1941,8 +1731,8 @@ class mainWindow: self.settingsTab = TKttk.Frame(self.mainMenu) self.settingsTab.config(style = "mainMenuTabFrame.TFrame") - self.settingsTabImg = PLimg.open(GUI.R()['settingsTabIcon']) - self.settingsTabImg = self.settingsTabImg.resize((GUI.R()['tabIconsSize'], GUI.R()['tabIconsSize']), PLimg.ANTIALIAS) + self.settingsTabImg = PLimg.open(GUI.R('settingsTabIcon')) + self.settingsTabImg = self.settingsTabImg.resize((GUI.R('tabIconsSize'), GUI.R('tabIconsSize')), PLimg.ANTIALIAS) self.settingsTabImg = PLitk.PhotoImage(self.settingsTabImg) self.mainMenu.add(self.settingsTab, image = self.settingsTabImg, state = TK.NORMAL) @@ -1951,13 +1741,13 @@ class mainWindow: self.settingsHeader = TKttk.Label(self.settingsTab) self.settingsHeader.config(style = 'tabHeader.TLabel') self.settingsHeader.config(text = 'USTAWIENIA') - self.settingsHeader.pack(fill = TK.X) + self.settingsHeader.pack(fill = GUI.R('headerFill')) # Zawartość self.settingsFrame = TKttk.Frame(self.settingsTab) - self.settingsFrame.config(style = 'tabFrame.TFrame') - self.settingsFrame.pack(fill = TK.BOTH, expand = 1, padx = GUI.R()['tabFramePadding'], pady = GUI.R()['tabFramePadding']) + self.settingsFrame.config(style = 'contentTabFrame.TFrame') + self.settingsFrame.pack(fill = GUI.R('contentTabFrameFill'), expand = GUI.R('contentTabFrameExpand'), padx = GUI.R('tabFramePadding'), pady = GUI.R('tabFramePadding')) ###################################################################### @@ -1968,8 +1758,8 @@ class mainWindow: self.aboutTab = TKttk.Frame(self.mainMenu) self.aboutTab.config(style = "mainMenuTabFrame.TFrame") - self.aboutTabImg = PLimg.open(GUI.R()['aboutTabIcon']) - self.aboutTabImg = self.aboutTabImg.resize((GUI.R()['tabIconsSize'], GUI.R()['tabIconsSize']), PLimg.ANTIALIAS) + self.aboutTabImg = PLimg.open(GUI.R('aboutTabIcon')) + self.aboutTabImg = self.aboutTabImg.resize((GUI.R('tabIconsSize'), GUI.R('tabIconsSize')), PLimg.ANTIALIAS) self.aboutTabImg = PLitk.PhotoImage(self.aboutTabImg) self.mainMenu.add(self.aboutTab, image = self.aboutTabImg, state = TK.NORMAL) @@ -1978,16 +1768,16 @@ class mainWindow: self.aboutHeader = TKttk.Label(self.aboutTab) self.aboutHeader.config(style = 'tabHeader.TLabel') self.aboutHeader.config(text = 'O PROGRAMIE') - self.aboutHeader.pack(fill = TK.X) + self.aboutHeader.pack(fill = GUI.R('headerFill')) # Zawartość self.aboutFrame = TKttk.Frame(self.aboutTab) - self.aboutFrame.config(style = 'tabFrame.TFrame') - self.aboutFrame.pack(fill = TK.BOTH, expand = 1, padx = GUI.R()['tabFramePadding'], pady = GUI.R()['tabFramePadding']) + self.aboutFrame.config(style = 'contentTabFrame.TFrame') + self.aboutFrame.pack(fill = GUI.R('contentTabFrameFill'), expand = GUI.R('contentTabFrameExpand'), padx = GUI.R('tabFramePadding'), pady = GUI.R('tabFramePadding')) ###################################################################### - + # Akcje przycisków - TAB1 diff --git a/assets/icon.ico b/icon.ico similarity index 100% rename from assets/icon.ico rename to icon.ico