Datemenu spacing improvements, modal/script/notif buttons fixes

- Now "spacing" property is responsible for spacings in datemenu, not components with margins. Looks the same on 47 and 43;
- Fixed styles mismatch on older GNOME versions;
- Fixed notification buttons on older GNOME versions;
- Fixed some buttons in login/unlock dialogs on older GNOME versions;
- Fixed an issue where generate_file moved specific GNOME version assets to marble folder instead of copying them to temp folder;
This commit is contained in:
Vladyslav Hroshev
2025-03-17 14:23:57 +02:00
parent 1bc6a89d77
commit cf007eab54
8 changed files with 64 additions and 43 deletions

View File

@@ -33,7 +33,7 @@ class Theme:
# move files to temp folder
copy_files(self.theme_folder, self.temp_folder)
generate_file(f"{self.theme_folder}", self.main_styles)
generate_file(f"{self.theme_folder}", self.temp_folder, self.main_styles)
# after generating main styles, remove .css and .versions folders
shutil.rmtree(f"{self.temp_folder}/.css/", ignore_errors=True)
shutil.rmtree(f"{self.temp_folder}/.versions/", ignore_errors=True)

View File

@@ -3,10 +3,11 @@ import shutil
from .gnome import gnome_version
from .get_version_folder import get_version_folders
def generate_file(folder, final_file):
def generate_file(folder, temp_folder, final_file):
"""
Combines all files in a folder into a single file
:param folder: source folder
:param temp_folder: temporary folder
:param final_file: location where file will be created
"""
opened_file = open(final_file, "w")
@@ -32,6 +33,6 @@ def generate_file(folder, final_file):
for file in os.listdir(version_path):
if file.endswith('.svg'):
shutil.move(os.path.join(version_path, file), folder)
shutil.copy(os.path.join(version_path, file), temp_folder)
opened_file.close()

View File

@@ -7,7 +7,6 @@ def gnome_version() -> str | None:
try:
output = subprocess.check_output(['gnome-shell', '--version'], text=True).strip()
print(output)
return output.split(' ')[2]
except subprocess.CalledProcessError:
return None