Skip to content

Commit dd7e45f

Browse files
nanocode38nanocode38
committed
Merge branch 'release-v2.6.0' into develop
Release v2.6.0 is Ready
2 parents 9b7b699 + 2b2ec00 commit dd7e45f

File tree

9 files changed

+13
-15
lines changed

9 files changed

+13
-15
lines changed

‎Web/icon.ico‎

-138 KB
Binary file not shown.

‎Web/icon_small.ico‎

-8.79 KB
Binary file not shown.

‎Web/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<title>PyHelper: Python & Pygame Enhancement Toolkit</title>
7-
<link rel="icon" href="icon.ico" type="image/width-icon">
7+
<link rel="icon" href="../assets/LOGO.png" type="image/width-icon">
88
<link rel="stylesheet" href="styles.css">
99
</head>
1010
<body>
@@ -14,9 +14,9 @@
1414
<!-- Navbar with logo -->
1515
<div class="navbar">
1616
<div class="logo-container">
17-
<img src="icon_small.ico" class="navbar-logo"></img>
17+
<img src="../assets/LOGO.png" class="navbar-logo" width="80px" height="80px"></img>
1818

19-
<div class="logo-prompt">PyHelper</div>
19+
<div class="logo-prompt">&nbsp&nbsp&nbsp&nbspPyHelper</div>
2020
</div>
2121
<div class="nav-links">
2222
<a href="https://GitHub.com/nanocode38/pyhelper.git" class="nav-button">GitHub</a>
@@ -27,7 +27,7 @@
2727
<!-- Main content -->
2828
<div class="content">
2929
<!-- Main logo -->
30-
<img src="icon.ico" class="navbar-logo"></img>
30+
<img src="../assets/LOGO.png" class="navbar-logo" width="300px"></img>
3131

3232
<h1>Welcome to PyHelper</h1>
3333
<h3>PyHelper is a powerful tool set for complementing Python and Pygame development. Enhance your coding experience with our utilities and helpers.</h3>

‎Web/styles.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ body {
6262
display: flex;
6363
align-items: center;
6464
animation: fadeIn 0.8s ease-out;
65+
font-size: 30px;
6566
}
6667

6768
.nav-logo {

‎assets/LOGO.png‎

157 KB
Loading

‎main.py‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎pyhelper/gamehelpers/pghelper/widgets.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,9 +709,9 @@ def set_value(self, new_text: str | None = None, new_color: Color | None = None)
709709
"""
710710
if new_text is not None:
711711
self.text = new_text
712-
if new_color is None:
712+
if new_color is not None:
713713
self.color = new_color
714-
self.image = self.font.render(self.text, True, new_color)
714+
self.image = self.font.render(self.text, True, self.color)
715715
self.rect = self.image.get_rect()
716716

717717
def draw(self):

‎pyproject.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ where = ["."]
3838

3939
[tool.black]
4040
line-length = 120
41+
skip = [".history", "*.egg-info", "build", "dist", "docs", "tests", "venv", "*.pyc", "*.pyo", "*.so", "*.dll", "*.dylib", "*.exe", "*.bat", "*.cmd", "*.pth", "*.whl", "*.egg", "*.egg-info", "*.egg-info/*", ".venv", ".idea"]
4142

4243
[tool.isort]
4344
profile = "black"
45+
skip = [".history", "*.egg-info", "build", "dist", "docs", "tests", "venv", "*.pyc", "*.pyo", "*.so", "*.dll", "*.dylib", "*.exe", "*.bat", "*.cmd", "*.pth", "*.whl", "*.egg", "*.egg-info", "*.egg-info/*", ".venv", ".idea"]
4446

4547
[tool.autoflake]
4648
remove_unused_imports = true
@@ -50,4 +52,4 @@ remove_unused_variables = true
5052
version = {attr = "pyhelper.__version__"}
5153

5254
[tool.setuptools.package-data]
53-
"pythonhelper" = ["README.md", "HISTORY.md", "LICENSE", "LOGO.png", "img.png", "img_1.png", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md"]
55+
"pythonhelper" = ["README.md", "HISTORY.md", "LICENSE", "assets/LOGO.png", "img.png", "img_1.png", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md"]

‎tests/test_all.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
from pyhelper.gamehelpers.pghelper.widgets import *
99

1010
if __name__ == "__main__":
11-
# os.chdir("..")
11+
if not os.path.exists("pyhelper"):
12+
os.chdir("..")
1213
with chdir("./pyhelper"):
1314
os.system("python __init__.py")
1415
os.system("python mathhelper.py")
@@ -95,7 +96,7 @@
9596
text2.set_value("b")
9697
text2.rect.topright = screen.get_rect().topright
9798

98-
image = Image(screen, (0, 0), r"..\images\pythonIcon.png")
99+
image = Image(screen, r"..\images\pythonIcon.png", loc=(0, 0))
99100
image.rect.bottomleft = (10, screen.get_height() - 10)
100101

101102
config = InputTextConfig(screen)

0 commit comments

Comments
 (0)