MateuszSkoczek/GeneratorCSV
0
0
Fork 0
Code Issues Pull Requests Actions Releases 1 Wiki Activity

4.0 Beta (Build 20241.2)

Browse Source
This commit is contained in:
Mateusz Skoczek
2020-08-28 21:34:16 +02:00
Unverified
parent 98f2a73d10
commit 65cfcfe67b
15 changed files with 176 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.vscode/launch.json vendored
View File

@@ -11,5 +11,6 @@
"program": "${file}", "program": "${file}",
"console": "integratedTerminal" "console": "integratedTerminal"
}, },
] ]
} }

4
.vscode/settings.json vendored
View File

@@ -1,4 +0,0 @@
{
"python.linting.pylintEnabled": true,
"python.linting.enabled": true
}

BIN
assets/documentation-page/icon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 140 KiB

BIN
assets/documentation-page/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 43 KiB

0
default-configs/config.cfg → configs/config.cfg
View File

0
default-configs/style.cfg → configs/style.cfg
View File

4
changelog-UC.txt → dev-changelog.txt
View File

@@ -113,3 +113,7 @@
4.0 Beta (Build 20241.1) 4.0 Beta (Build 20241.1)
- Ukończenie karty 'O PROGRAMIE' - Ukończenie karty 'O PROGRAMIE'
4.0 Beta (Build 20241.2)
- Dodanie do paska tytułu programVersionStage
- Pzzygotowanie strony na dokumentację i instrukcję

12
documentation/about_program.html Normal file
View File

@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<link rel = "stylesheet" type = "text/css" href = "content.css">
<meta charset = "utf-8">
<link rel = "shortcut icon" href = "../assets/documentation-page/icon.ico">
<title>Generator CSV</title>
</head>
<body>
<p>XD</p>
</body>
</html>

3
documentation/content.css Normal file
View File

@@ -0,0 +1,3 @@
p {
color: #C0C0C0
}

12
documentation/how_to_use.html Normal file
View File

@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<link rel = "stylesheet" type = "text/css" href = "content.css">
<meta charset = "utf-8">
<link rel = "shortcut icon" href = "../assets/documentation-page/icon.ico">
<title>Generator CSV</title>
</head>
<body>
<p>no siema</p>
</body>
</html>

28
documentation/index.html Normal file
View File

@@ -0,0 +1,28 @@
<!DOCTYPE html>
<html>
<head>
<link rel = "stylesheet" type = "text/css" href = "main.css">
<meta charset = "utf-8">
<link rel = "shortcut icon" href = "../assets/documentation-page/icon.ico">
<title>Generator CSV</title>
</head>
<body>
<header>
<img id = "header-image" src = "../assets/documentation-page/icon.png">
<div id = "header-text">
<p>GENERATOR CSV</p>
</div>
</header>
<nav>
<ul id = "menu-ul">
<li id = "menu-li"><a href = "about_program.html" target = "content">O programie</a></li>
<li id = "menu-li"><a href = "how_to_use.html" target = "content">Jak używać?</a></li>
<li id = "menu-li"><a href = "program_documentation.html" target = "content">Dokumentacja programistyczna</a></li>
<li id = "menu-li"><a href = "other.html" target = "content">Inne</a></li>
</ul>
</nav>
<section>
<iframe name = "content" src = "about_program.html"></iframe>
</section>
</body>
</html>

77
documentation/main.css Normal file
View File

@@ -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%;
}

12
documentation/other.html Normal file
View File

@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<link rel = "stylesheet" type = "text/css" href = "content.css">
<meta charset = "utf-8">
<link rel = "shortcut icon" href = "../assets/documentation-page/icon.ico">
<title>Generator CSV</title>
</head>
<body>
<p>w sumie jeszcze nie wiem co tu dam</p>
</body>
</html>

12
documentation/program_documentation.html Normal file
View File

@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<link rel = "stylesheet" type = "text/css" href = "content.css">
<meta charset = "utf-8">
<link rel = "shortcut icon" href = "../assets/documentation-page/icon.ico">
<title>Generator CSV</title>
</head>
<body>
<p>siema siema kurwa witam</p>
</body>
</html>

23
generator.pyw
View File

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