Skip to content

Commit b99eabb

Browse files
committed
Button padding fixes
1 parent 3ba56a7 commit b99eabb

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

GWSL_profiles.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def login(*args):
4848
lbl = tk.Label(boxRoot, text="Add", justify=LEFT) # , font=("Helvetica", 16))
4949
# lbl.grid(row=0, padx=10, sticky="W")
5050
boxRoot.grid_rowconfigure(0, weight=0)
51-
51+
boxRoot.iconbitmap(asset_dir + "\icon.ico")
5252
# First frame
5353

5454
frame_1 = ttk.Frame(boxRoot, padding="0.15i")

build.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,30 @@
33
import shutil
44
from distutils.dir_util import copy_tree
55

6-
version = "139 WIN32 build 2"
6+
version = "139 MSIX build 2 debug"
77

88

99
print("\nBuilding Dashboard...")
1010
PyInstaller.__main__.run([
1111
'manager.py',
1212
'-i=assets/icon.ico',
13-
'-w',
13+
#'-w',
1414
'-y',
15-
'-n=GWSL'
15+
'-n=GWSL',
16+
'--hidden-import=pkg_resources.py2_warn'
1617
])
1718

1819

1920
print("\nBuilding Service...")
2021
PyInstaller.__main__.run([
2122
'main.py',
2223
'-i=assets/icon.ico',
23-
'-w',
24+
#'-w',
2425
'-y',
2526
'-n=GWSL_service',
2627
'--hidden-import=pkg_resources',
27-
'--hidden-import=infi.systray'
28+
'--hidden-import=infi.systray',
29+
'--hidden-import=pkg_resources.py2_warn'
2830
])
2931

3032

manager.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import logging
3535
import ipaddress
3636

37-
BUILD_MODE = "WIN32" # MSIX or WIN32
37+
BUILD_MODE = "MSIX" # MSIX or WIN32
3838

3939
version = "1.3.9"
4040

@@ -512,7 +512,7 @@ def get_pos():
512512
long = win32gui.GetWindowLong(hwnd, win32con.GWL_EXSTYLE)
513513
win32gui.SetWindowLong(hwnd, win32con.GWL_EXSTYLE,
514514
long | win32con.WS_EX_LAYERED)
515-
win32con.WS_BORDER
515+
#win32con.WS_BORDER
516516

517517
#win32gui.SetLayeredWindowAttributes(HWND, win32api.RGB(*[100, 100, 100]), int(255), win32con.LWA_COLORKEY)
518518

@@ -3398,7 +3398,7 @@ def reseticon():
33983398
save_b.grid(column=1, row=0, sticky="SWE", padx=10)
33993399

34003400
test_b = ttk.Button(frame_3, text="Test Configuration", command=test)
3401-
test_b.grid(column=2, row=0, sticky="SE", padx=10)
3401+
test_b.grid(column=2, row=0, sticky="SE", padx=10, ipadx=5)
34023402

34033403
frame_3.grid(row=2, column=0, padx=20, pady=20, sticky="SWE", columnspan=2)
34043404

@@ -4199,7 +4199,7 @@ def __init__(self, MainWindow, expanded_text, collapsed_text):
41994199
# Creating Checkbutton
42004200
self._button = ttk.Checkbutton(self, variable=self._variable,
42014201
command=self._activate, style="TButton")
4202-
self._button.grid(row=0, column=0)
4202+
self._button.grid(row=0, column=0, ipadx=5)
42034203
# Create a Horizontal line
42044204
# self._separator = ttk.Separator(self, orient="horizontal")
42054205
# self._separator.grid(row=0, column=1, sticky="we")

0 commit comments

Comments
 (0)