From cdd5a2f8eab48117b181f2bfa7536a6839220114 Mon Sep 17 00:00:00 2001 From: Mateusz Skoczek Date: Thu, 6 Aug 2020 18:35:18 +0200 Subject: [PATCH] 4.0 Alpha (Build 20017) --- assets/tab_icons/format.png | Bin 0 -> 426 bytes changelog-UC.txt | 5 +- config/format.cfg | 9 ++ format_readme.txt | 0 generator.py | 193 ++++++++++++++++++++++++---- src/__pycache__/vars.cpython-38.pyc | Bin 2402 -> 0 bytes src/load_cfg.py | 0 src/vars.py | 38 +++++- 8 files changed, 212 insertions(+), 33 deletions(-) create mode 100644 assets/tab_icons/format.png create mode 100644 config/format.cfg create mode 100644 format_readme.txt delete mode 100644 src/__pycache__/vars.cpython-38.pyc create mode 100644 src/load_cfg.py diff --git a/assets/tab_icons/format.png b/assets/tab_icons/format.png new file mode 100644 index 0000000000000000000000000000000000000000..449443debafa5636a248e3e0b16800a38a99e7c2 GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0 z-33Sk!B6Mi^+1ZVz$3C4NPB>>+sSM@AS2t;#W5t~-rH-ATnz?1EDo>#|CjM^)#`HE zy3nGSSNEp(q*TTS=TC(yDk<&W8M}DtoNv3*%&&Pj zRdP`(kYX@0Ff!0JFw`|P3o$geGBvU?Hq +N, I X L X +Q + +Q + +Q \ No newline at end of file diff --git a/format_readme.txt b/format_readme.txt new file mode 100644 index 0000000..e69de29 diff --git a/generator.py b/generator.py index 3a34c22..3cc2356 100644 --- a/generator.py +++ b/generator.py @@ -125,7 +125,7 @@ def gui(): iconTabImg = PLitk.PhotoImage(iconTabImg) mainMenu.add(iconTab, image = iconTabImg, state = TK.DISABLED) - # TAB2 - Generowanie plików + # Generowanie plików generateTab = TK.Frame(mainMenu) generateTab.config(background = SCvar_gui.color.mainBG) generateTabImg = PLimg.open(SCvar_gui.image.generateTab) @@ -133,7 +133,7 @@ def gui(): generateTabImg = PLitk.PhotoImage(generateTabImg) mainMenu.add(generateTab, image = generateTabImg) - # TAB3 - Dołącz do pliku + # Dołączanie do pliku linkTab = TK.Frame(mainMenu) linkTab.config(background = SCvar_gui.color.mainBG) linkTabImg = PLimg.open(SCvar_gui.image.linkTab) @@ -141,7 +141,7 @@ def gui(): linkTabImg = PLitk.PhotoImage(linkTabImg) mainMenu.add(linkTab, image = linkTabImg) - # TAB4 - Łączenie plików + # Łączenie plików mergeTab = TK.Frame(mainMenu) mergeTab.config(background = SCvar_gui.color.mainBG) mergeTabImg = PLimg.open(SCvar_gui.image.mergeTab) @@ -149,7 +149,7 @@ def gui(): mergeTabImg = PLitk.PhotoImage(mergeTabImg) mainMenu.add(mergeTab, image = mergeTabImg) - # TAB5 - Ustawienia + # Ustawienia settingsTab = TK.Frame(mainMenu) settingsTab.config(background = SCvar_gui.color.mainBG) settingsTabImg = PLimg.open(SCvar_gui.image.settingsTab) @@ -157,7 +157,15 @@ def gui(): settingsTabImg = PLitk.PhotoImage(settingsTabImg) mainMenu.add(settingsTab, image = settingsTabImg) - # TAB6 - Informacje + # Format danych + formatTab = TK.Frame(mainMenu) + formatTab.config(background = SCvar_gui.color.mainBG) + formatTabImg = PLimg.open(SCvar_gui.image.formatTab) + formatTabImg = formatTabImg.resize((SCvar_gui.dimension.iconTab, SCvar_gui.dimension.iconTab), PLimg.ANTIALIAS) + formatTabImg = PLitk.PhotoImage(formatTabImg) + mainMenu.add(formatTab, image = formatTabImg) + + # Informacje infoTab = TK.Frame(mainMenu) infoTab.config(background = SCvar_gui.color.mainBG) infoTabImg = PLimg.open(SCvar_gui.image.infoTab) @@ -207,28 +215,161 @@ def gui(): - # TAB5 - tab5Label = TK.Label(settingsTab) - tab5Label.config(text = 'USTAWIENIA') - tab5Label.config(font = (SCvar_gui.fonts.tabHeader[0], SCvar_gui.fonts.tabHeader[1])) - tab5Label.config(bg = SCvar_gui.color.headerBG) - tab5Label.config(fg = SCvar_gui.color.headerText) - tab5Label.config(bd = SCvar_gui.dimension.tabHeaderHeight) - tab5Label.config(width = SCvar_gui.dimension.tabHeaderWidth) - tab5Label.grid(row = 0) + # SETTINGSTAB + settingsTabLabel = TK.Label(settingsTab) + settingsTabLabel.config(text = 'USTAWIENIA') + settingsTabLabel.config(font = (SCvar_gui.fonts.tabHeader[0], SCvar_gui.fonts.tabHeader[1])) + settingsTabLabel.config(bg = SCvar_gui.color.headerBG) + settingsTabLabel.config(fg = SCvar_gui.color.headerText) + settingsTabLabel.config(bd = SCvar_gui.dimension.tabHeaderHeight) + settingsTabLabel.config(width = SCvar_gui.dimension.tabHeaderWidth) + settingsTabLabel.grid(row = 0) - # TAB6 - tab6Label = TK.Label(infoTab) - tab6Label.config(text = 'INFORMACJE') - tab6Label.config(font = (SCvar_gui.fonts.tabHeader[0], SCvar_gui.fonts.tabHeader[1])) - tab6Label.config(bg = SCvar_gui.color.headerBG) - tab6Label.config(fg = SCvar_gui.color.headerText) - tab6Label.config(bd = SCvar_gui.dimension.tabHeaderHeight) - tab6Label.config(width = SCvar_gui.dimension.tabHeaderWidth) - tab6Label.grid(row = 0) + # FORMATTAB + formatTabLabel = TK.Label(formatTab) + formatTabLabel.config(text = 'FORMAT DANYCH') + formatTabLabel.config(font = (SCvar_gui.fonts.tabHeader[0], SCvar_gui.fonts.tabHeader[1])) + formatTabLabel.config(bg = SCvar_gui.color.headerBG) + formatTabLabel.config(fg = SCvar_gui.color.headerText) + formatTabLabel.config(bd = SCvar_gui.dimension.tabHeaderHeight) + formatTabLabel.config(width = SCvar_gui.dimension.tabHeaderWidth) + formatTabLabel.grid(row = 0) + + + # Labelframe - Pliki wejściowe + inFilesLabelFrame = TK.LabelFrame(formatTab) + inFilesLabelFrame.config(text = ' Pliki wejściowe ') + inFilesLabelFrame.config(bg = SCvar_gui.color.mainBG) + inFilesLabelFrame.config(fg = SCvar_gui.color.lfText) + inFilesLabelFrame.config(bd = SCvar_gui.dimension.lfBorderwidth) + inFilesLabelFrame.grid(row = 1, pady = SCvar_gui.dimension.framePadY) + + # UczniowieLABEL + inStudentsLABEL = TK.Label(inFilesLabelFrame) + inStudentsLABEL.config(text = 'Uczniowie') + inStudentsLABEL.config(bg = SCvar_gui.color.mainBG) + inStudentsLABEL.config(fg = SCvar_gui.color.label1) + inStudentsLABEL.grid(row = 0, column = 0) + + # Uczniowie inFormatInput + inStudentsFormatInput = TK.Text(inFilesLabelFrame) + inStudentsFormatInput.config(bg = SCvar_gui.color.textboxBG) + inStudentsFormatInput.config(fg = SCvar_gui.color.textboxText) + inStudentsFormatInput.config(bd = SCvar_gui.dimension.tbBorderwidth) + inStudentsFormatInput.config(width = SCvar_gui.dimension.tbWidth) + inStudentsFormatInput.config(height = SCvar_gui.dimension.tbHeight) + inStudentsFormatInput.grid(row = 1, column = 0, padx = SCvar_gui.dimension.tbPad, pady = SCvar_gui.dimension.tbPad) + + # NauczycieleLABEL + inTeachersLABEL = TK.Label(inFilesLabelFrame) + inTeachersLABEL.config(text = 'Nauczyciele') + inTeachersLABEL.config(bg = SCvar_gui.color.mainBG) + inTeachersLABEL.config(fg = SCvar_gui.color.label1) + inTeachersLABEL.grid(row = 0, column = 1) + + # Nauczyciele inFormatInput + inTeachersFormatInput = TK.Text(inFilesLabelFrame) + inTeachersFormatInput.config(bg = SCvar_gui.color.textboxBG) + inTeachersFormatInput.config(fg = SCvar_gui.color.textboxText) + inTeachersFormatInput.config(bd = SCvar_gui.dimension.tbBorderwidth) + inTeachersFormatInput.config(width = SCvar_gui.dimension.tbWidth) + inTeachersFormatInput.config(height = SCvar_gui.dimension.tbHeight) + inTeachersFormatInput.grid(row = 1, column = 1, padx = SCvar_gui.dimension.tbPad, pady = SCvar_gui.dimension.tbPad) + + + # Labelframe - Pliki wejściowe + outFilesLabelFrame = TK.LabelFrame(formatTab) + outFilesLabelFrame.config(text = ' Pliki wyjściowe ') + outFilesLabelFrame.config(bg = SCvar_gui.color.mainBG) + outFilesLabelFrame.config(fg = SCvar_gui.color.lfText) + outFilesLabelFrame.config(bd = SCvar_gui.dimension.lfBorderwidth) + outFilesLabelFrame.grid(row = 2, pady = SCvar_gui.dimension.framePadY) + + # UczniowieLABEL + outStudentsLABEL = TK.Label(outFilesLabelFrame) + outStudentsLABEL.config(text = 'Uczniowie') + outStudentsLABEL.config(bg = SCvar_gui.color.mainBG) + outStudentsLABEL.config(fg = SCvar_gui.color.label1) + outStudentsLABEL.grid(row = 0, column = 0) + + # Uczniowie outFormatInput + outStudentsFormatInput = TK.Entry(outFilesLabelFrame) + outStudentsFormatInput.config(bg = SCvar_gui.color.textboxBG) + outStudentsFormatInput.config(fg = SCvar_gui.color.textboxText) + outStudentsFormatInput.config(bd = SCvar_gui.dimension.tbBorderwidth) + outStudentsFormatInput.config(width = SCvar_gui.dimension.tbWidth2) + outStudentsFormatInput.grid(row = 1, column = 0, padx = SCvar_gui.dimension.tbPad, pady = SCvar_gui.dimension.tbPad) + + # NauczycieleLABEL + outTeachersLABEL = TK.Label(outFilesLabelFrame) + outTeachersLABEL.config(text = 'Nauczyciele') + outTeachersLABEL.config(bg = SCvar_gui.color.mainBG) + outTeachersLABEL.config(fg = SCvar_gui.color.label1) + outTeachersLABEL.grid(row = 0, column = 1) + + # Nauczyciele outFormatInput + outTeachersFormatInput = TK.Entry(outFilesLabelFrame) + outTeachersFormatInput.config(bg = SCvar_gui.color.textboxBG) + outTeachersFormatInput.config(fg = SCvar_gui.color.textboxText) + outTeachersFormatInput.config(bd = SCvar_gui.dimension.tbBorderwidth) + outTeachersFormatInput.config(width = SCvar_gui.dimension.tbWidth2) + outTeachersFormatInput.grid(row = 1, column = 1, padx = SCvar_gui.dimension.tbPad, pady = SCvar_gui.dimension.tbPad) + + + # Frame - Przyciski + formatButtonsFrame = TK.Frame(formatTab) + formatButtonsFrame.config(bg = SCvar_gui.color.mainBG) + formatButtonsFrame.grid(row = 3, pady = SCvar_gui.dimension.framePadY) + + # Zapisz + saveFormatButton = TK.Button(formatButtonsFrame) + saveFormatButton.config(text = 'ZAPISZ') + saveFormatButton.config(bg = SCvar_gui.color.buttonBG) + saveFormatButton.config(fg = SCvar_gui.color.buttonText) + saveFormatButton.config(relief = TK.FLAT) + saveFormatButton.config(activebackground = SCvar_gui.color.buttonBG) + saveFormatButton.config(activeforeground = SCvar_gui.color.buttonText) + saveFormatButton.config(height = SCvar_gui.dimension.bnHeight) + saveFormatButton.config(width = SCvar_gui.dimension.bnWidth) + saveFormatButton.grid(row = 0, column = 0, padx = 5) + + # Pomoc + def saveFormatButtonCommand(): + try: + x = open('format_readme.txt') + except FileNotFoundError: + print('x') + except: + print('x') + else: + OS.system("notepad format_readme.txt") + instructionFormatButton = TK.Button(formatButtonsFrame) + instructionFormatButton.config(text = 'POMOC') + instructionFormatButton.config(bg = SCvar_gui.color.buttonBG) + instructionFormatButton.config(fg = SCvar_gui.color.buttonText) + instructionFormatButton.config(relief = TK.FLAT) + instructionFormatButton.config(activebackground = SCvar_gui.color.buttonBG) + instructionFormatButton.config(activeforeground = SCvar_gui.color.buttonText) + instructionFormatButton.config(height = SCvar_gui.dimension.bnHeight) + instructionFormatButton.config(width = SCvar_gui.dimension.bnWidth2) + instructionFormatButton.config(command = saveFormatButtonCommand) + instructionFormatButton.grid(row = 0, column = 1, padx = 5) + + + + + # INFOTAB + infoTabLabel = TK.Label(infoTab) + infoTabLabel.config(text = 'INFORMACJE') + infoTabLabel.config(font = (SCvar_gui.fonts.tabHeader[0], SCvar_gui.fonts.tabHeader[1])) + infoTabLabel.config(bg = SCvar_gui.color.headerBG) + infoTabLabel.config(fg = SCvar_gui.color.headerText) + infoTabLabel.config(bd = SCvar_gui.dimension.tabHeaderHeight) + infoTabLabel.config(width = SCvar_gui.dimension.tabHeaderWidth) + infoTabLabel.grid(row = 0) # Separator1 separator1 = TK.Label(infoTab) @@ -277,12 +418,8 @@ def gui(): copyrightInfo.grid(row = 6) # Autorzy - authors = '' - for x in SCvar_inf.authors: - authors += (x + '\n') - authors += ('dla ' + SCvar_inf.school) authorsInfo = TK.Label(infoTab) - authorsInfo.config(text = authors) + authorsInfo.config(text = SCvar_inf.authors + '\ndla ' + SCvar_inf.school) authorsInfo.config(font = (SCvar_gui.fonts.info1[0], SCvar_gui.fonts.info1[4])) authorsInfo.config(background = SCvar_gui.color.mainBG) authorsInfo.config(foreground = SCvar_gui.color.headerText) diff --git a/src/__pycache__/vars.cpython-38.pyc b/src/__pycache__/vars.cpython-38.pyc deleted file mode 100644 index 38f86696ff4db832fb4e28b470cfff69f1a5ad25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2402 zcmaJ?+iv4T7`7e9cAO?@mudwFgrP_%5_H?Npe{nIsx5STK{wj$L9!x@o0&SMiJcug z?bf&KGjI);T=NLPOUx}-c>wPDW}IV_CD#1;599ey-~4`Fsn`mBf4y>k_^7NX{|I6J zSAcMcm3#_96jwP_h)T3K3ekSnToqD*=#X?s8Y#Avx-q=QR(s1ir4eO*8Z+m(^#bz# z_Kx%I>j7n9pGK+QgX-ee`QA_IFv*YA58#}O( zp6|G=rqhZq;vT)R?JX$Xen_K;g73id!cT>Ch?RT-LKRm<3K~(}0?}NZ6x<@wU4s+@ z)isHM;7x80Sa23y##v<{{;WLbHe0`&OI98SE8@&*cal10Xs ze$De<4gKEOqKkiSB%N*?_qcgYSrWz(FWyq0CEWCfX*Xuc?+Oz=ljPq=;4Z&zKZ)oG z3$JPW425VnS^N{dLe&N=4w&En^N*YMLN@J$b=ucBbbD~iM2+6TO2ny_s*fM3Un=Mn z4^OdqQqToV6c#X{Ln;yj2r+<=A|#VokSs_Bq!O_q*^o?9Mg!Kk84SZ02yMyrw3i2S zt`~ZVBhgb6J+(;DEfK@DiRqS!<*t#ETOl?al(UVogKZ*!C@MVK#EBy;Wn>A`6od%! ziy)dH!uv=EIj>il&@fR7CN$g(J8|^Pzu={dm=VeZTNS#dPe>RALf%aMiCsG%m9U#rj-%bCbNoGDT zvdW|(owygX%-m}1Huf7QVD|R*4)z;DbI>^6+Xr*JBOY9+yFD=aei$8{^4c&;XpeSM zN>FwvDvP4kmF0%P&bepwb-J<&MH$Xl$RWQOn#>!yv(NrF>(B3Iy)bITpaDEhz|#Ue zOMs+3t3cTI1De(RB%x{YKtO04B>P~jh|?}*p4>FH4x%7?Z)^p0Jn_n$>BA*ckWXd0 zz52~w7+p!z`%7>3DGTz~mQO{vDS(c7vN|5%R+!G~<-2_=&!L&G&k0XNu1sK$mnT7^ zqudlB3dWKF39dYGFYO_mfmz*CS-TU_({&Ju>M5Gh*#}TA;aObtL#*ToWQJ#=1sXmi zDn1@M)qe%5e^XUOa{81jE^_%tX4db^I7*YuYSAF3&hxX;8a%KH$ViU(8o2Yiakplr zbTTz~QDnQz4Sz785m}wHbkf36i8$WUtb(E1@?l>>v6Sz0(7p@nEMJl9=fZty+=#^Ll}so=4)2=gBXk)UG;)Ti@iL^+%$9 MiTE(+_o|iu0DwD8ssI20 diff --git a/src/load_cfg.py b/src/load_cfg.py new file mode 100644 index 0000000..e69de29 diff --git a/src/vars.py b/src/vars.py index 7fdd26d..3712333 100644 --- a/src/vars.py +++ b/src/vars.py @@ -21,7 +21,7 @@ class prgInfo: school = 'ZSP Sobolew' # Nazwa szkoły version = '4.0 Experimental' # Wersja programu years = '2019 - 2020' # Lata pracy na programem - authors = ['Mateusz Skoczek'] # Autorzy + authors = 'Mateusz Skoczek' # Autorzy @@ -42,7 +42,23 @@ class guiVars: tabHeaderHeight = 8 # Wysokość nagłówka tabHeaderWidth = 80 # Szerokość nagłówka - # Informacje + # Labelframe'y + lfBorderwidth = 1 # Szerokość obramowania + + # Textbox'y + tbBorderwidth = 0 # Szerokość obramowania + + # FORMATTAB + framePadY = 10 + tbPad = 8 + tbWidth = 42 + tbHeight = 9 + tbWidth2 = 56 + bnHeight = 2 + bnWidth = 30 + bnWidth2 = 30 + + # INFOTAB programIconInInfo = 100 # Szerokość/wysokość ikony programIconInInfoPlace = 150 # Wysokość kontrolki zawierającej ikonę separator1Height = 2 # Wysokość separator1 @@ -60,9 +76,22 @@ class guiVars: selectedTabBG = '#333842' # Wybrana karta # Nagłowki kart - headerBG = '#282C34' # Tło + headerBG = '#323741' # Tło headerText = '#C0C0C0' # Tekst + # Labelframe'y + lfText = '#C0C0C0' # Tekst + + # Label'e + label1 = '#C0C0C0' # Tekst + + # Textbox'y + textboxBG = '#282B36' # Tło + textboxText = '#C0C0C0' # Tekst + + # Button'y + buttonBG = '#323741' # Tło + buttonText = '#C0C0C0' # Tekst # Grafika class image: @@ -76,6 +105,7 @@ class guiVars: linkTab = 'assets/tab_icons/link.png' mergeTab = 'assets/tab_icons/merge.png' settingsTab = 'assets/tab_icons/settings.png' + formatTab = 'assets/tab_icons/format.png' infoTab = 'assets/tab_icons/info.png' @@ -84,7 +114,7 @@ class guiVars: # Główne tabHeader = ['Segoe UI', 12] # Nagłowki - # Informacje + # INFOTAB info1 = ['Segoe UI'] # Czcionka info1.append(20) # Wielkość tekstu - Nazwa programu info1.append(10) # Wielkość tekstu - Wersja programu