diff --git a/.vscode/launch.json b/.vscode/launch.json index 40b827b..cb017cc 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -11,5 +11,6 @@ "program": "${file}", "console": "integratedTerminal" }, + ] } \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 82a8511..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "python.linting.pylintEnabled": true, - "python.linting.enabled": true -} \ No newline at end of file diff --git a/assets/documentation-page/icon.ico b/assets/documentation-page/icon.ico new file mode 100644 index 0000000..49f2657 Binary files /dev/null and b/assets/documentation-page/icon.ico differ diff --git a/assets/documentation-page/icon.png b/assets/documentation-page/icon.png new file mode 100644 index 0000000..e0314ab Binary files /dev/null and b/assets/documentation-page/icon.png differ diff --git a/default-configs/config.cfg b/configs/config.cfg similarity index 100% rename from default-configs/config.cfg rename to configs/config.cfg diff --git a/default-configs/style.cfg b/configs/style.cfg similarity index 100% rename from default-configs/style.cfg rename to configs/style.cfg diff --git a/changelog-UC.txt b/dev-changelog.txt similarity index 94% rename from changelog-UC.txt rename to dev-changelog.txt index e7d7f86..ed16d73 100644 --- a/changelog-UC.txt +++ b/dev-changelog.txt @@ -112,4 +112,8 @@ - Zastosowanie nowego systemu przetwarzania plików konfiguracyjnych dla pliku 'config.cfg' w zapisie danych 4.0 Beta (Build 20241.1) -- Ukończenie karty 'O PROGRAMIE' \ No newline at end of file +- Ukończenie karty 'O PROGRAMIE' + +4.0 Beta (Build 20241.2) +- Dodanie do paska tytułu programVersionStage +- Pzzygotowanie strony na dokumentację i instrukcję \ No newline at end of file diff --git a/documentation/about_program.html b/documentation/about_program.html new file mode 100644 index 0000000..32e1bfc --- /dev/null +++ b/documentation/about_program.html @@ -0,0 +1,12 @@ + + + + + + + Generator CSV + + +

XD

+ + \ No newline at end of file diff --git a/documentation/content.css b/documentation/content.css new file mode 100644 index 0000000..37baf1b --- /dev/null +++ b/documentation/content.css @@ -0,0 +1,3 @@ +p { + color: #C0C0C0 +} \ No newline at end of file diff --git a/documentation/how_to_use.html b/documentation/how_to_use.html new file mode 100644 index 0000000..a421c3a --- /dev/null +++ b/documentation/how_to_use.html @@ -0,0 +1,12 @@ + + + + + + + Generator CSV + + +

no siema

+ + \ No newline at end of file diff --git a/documentation/index.html b/documentation/index.html new file mode 100644 index 0000000..706d989 --- /dev/null +++ b/documentation/index.html @@ -0,0 +1,28 @@ + + + + + + + Generator CSV + + +
+ +
+

GENERATOR CSV

+
+
+ +
+ +
+ + \ No newline at end of file diff --git a/documentation/main.css b/documentation/main.css new file mode 100644 index 0000000..205face --- /dev/null +++ b/documentation/main.css @@ -0,0 +1,77 @@ +body { + background-color: #21242D; + margin: 0px; +} + + + + +header { + width: 100%; + position: sticky; +} + +#header-image { + background-color: #333842; + width: 100px; + height: 100px; + float: left; + padding: 25px; +} + +#header-text { + background-color: #333842; + overflow: auto; + line-height: 40px; + font-family: 'Segoe UI'; + color: #C0C0C0; + font-size: 30px; + padding: 25px; +} + + + + +nav { + width: 100%; +} + +#menu-ul { + width: 100%; + padding: 0; + margin: 0; + list-style: none; +} + +#menu-li a { + display: block; + float: left; + text-align: center; + font-family: 'Segoe UI'; + padding: 0.8%; + margin-right: 0.05%; + margin-left: 0.05%; + font-size: 20px; + width: 23.3%; + text-decoration: none; + color: #C0C0C0; + background-color: #2e313b; +} + +#menu-li a:hover { + color: #C0C0C0; + background: #333842; +} + + + + +section { + width: 100%; +} + +iframe { + width: 99%; + border: none; + margin: 0.5%; +} \ No newline at end of file diff --git a/documentation/other.html b/documentation/other.html new file mode 100644 index 0000000..9dcbac4 --- /dev/null +++ b/documentation/other.html @@ -0,0 +1,12 @@ + + + + + + + Generator CSV + + +

w sumie jeszcze nie wiem co tu dam

+ + \ No newline at end of file diff --git a/documentation/program_documentation.html b/documentation/program_documentation.html new file mode 100644 index 0000000..7c5586e --- /dev/null +++ b/documentation/program_documentation.html @@ -0,0 +1,12 @@ + + + + + + + Generator CSV + + +

siema siema kurwa witam

+ + \ No newline at end of file diff --git a/generator.pyw b/generator.pyw index 0d427e3..d751bfe 100644 --- a/generator.pyw +++ b/generator.pyw @@ -17,7 +17,7 @@ class VAR: programName = 'Generator CSV' programVersion = '4.0' programVersionStage = 'Beta' - programVersionBuild = '20241.1' + programVersionBuild = '20241.2' programCustomer = 'ZSP Sobolew' programAuthors = ['Mateusz Skoczek'] programToW = ['styczeń', '2019', 'wrzesień', '2020'] @@ -42,6 +42,7 @@ import time as TM import codecs as CD import pathlib as PT import shutil as SU +import subprocess as SP # GUI @@ -86,6 +87,7 @@ MSGlist = { 'I0001' : 'Operacja ukończona pomyślnie', 'I0002' : 'Aplikacja zostanie zamknięta w celu przeładowania ustawień', 'E0015' : 'Nie można usunąć wybranych format presetów', + 'E0016' : 'Nie można uruchomić pliku instrukcji (documentation/index.html)', } def MSG(code, terminate, *optionalInfo): @@ -135,20 +137,20 @@ def checkAppdata(): if 'Generator CSV' not in [x for x in OS.listdir(appdata)]: try: OS.mkdir(str(appdata) + '/Generator CSV') - SU.copy('default-configs/config.cfg', str(appdata) + '\Generator CSV\config.cfg') - SU.copy('default-configs/style.cfg', str(appdata) + '\Generator CSV\style.cfg') + SU.copy('configs/config.cfg', str(appdata) + '\Generator CSV\config.cfg') + SU.copy('configs/style.cfg', str(appdata) + '\Generator CSV\style.cfg') OS.mkdir(str(appdata) + '/Generator CSV/format-presets') except Exception as exceptInfo: MSG('E0001', True, exceptInfo) else: if 'config.cfg' not in [x for x in OS.listdir(str(appdata) + '/Generator CSV')]: try: - SU.copy('default-configs/config.cfg', str(appdata) + '\Generator CSV\config.cfg') + SU.copy('configs/config.cfg', str(appdata) + '\Generator CSV\config.cfg') except Exception as exceptInfo: MSG('E0001', True, exceptInfo) if 'style.cfg' not in [x for x in OS.listdir(str(appdata) + '/Generator CSV')]: try: - SU.copy('default-configs/style.cfg', str(appdata) + '\Generator CSV\style.cfg') + SU.copy('configs/style.cfg', str(appdata) + '\Generator CSV\style.cfg') except Exception as exceptInfo: MSG('E0001', True, exceptInfo) if 'format-presets'not in [x for x in OS.listdir(str(appdata) + '/Generator CSV')]: @@ -1166,7 +1168,7 @@ class mainWindow: def __init__(self, master): # Okno self.master = master - master.title('%s %s' % (VAR.programName, VAR.programVersion)) + master.title('%s %s %s' % (VAR.programName, VAR.programVersion, VAR.programVersionStage)) 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')) @@ -2922,7 +2924,7 @@ class mainWindow: if MSG('A0005', False): try: OS.remove(str(appdata) + '\Generator CSV\config.cfg') - SU.copy('default-configs/config.cfg', str(appdata) + '\Generator CSV\config.cfg') + SU.copy('configs/config.cfg', str(appdata) + '\Generator CSV\config.cfg') except Exception as exceptInfo: MSG('E0001', True, exceptInfo) MSG('I0002', True) @@ -2933,7 +2935,7 @@ class mainWindow: if MSG('A0006', False): try: OS.remove(str(appdata) + '\Generator CSV\style.cfg') - SU.copy('default-configs/style.cfg', str(appdata) + '\Generator CSV\style.cfg') + SU.copy('configs/style.cfg', str(appdata) + '\Generator CSV\style.cfg') except Exception as exceptInfo: MSG('E0001', True, exceptInfo) MSG('I0002', True) @@ -2988,7 +2990,10 @@ class mainWindow: self.deleteSelectedFPButton.pack(fill = TK.X, padx = 6, pady = 6) def aboutInstructionButtonAction(self): - pass + try: + OS.startfile('documentation\index.html') + except Exception as exceptInfo: + MSG('E0016', False, exceptInfo)