diff --git a/tagstudio/resources/translations/de.json b/tagstudio/resources/translations/de.json index 6f49bde6..5fbb02f9 100644 --- a/tagstudio/resources/translations/de.json +++ b/tagstudio/resources/translations/de.json @@ -1,5 +1,5 @@ { - "about.content": "

TagStudio Alpha {version} ({branch})

TagStudio ist eine Anwendung zum organisieren von Fotos & Dateien mit einem zugrunde liegendem Tag-basierten System, welches sich darauf konzentriert, dem Nutzer Freiraum und Flexibilität zu bieten. Keine proprietären Programme oder Formate, kein Meer an Hilfsdateien und keine komplette Umwälzung deiner Dateisystemstruktur.

Lizenz: GPLv3
Konfigurations-Pfad: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub | Dokumentation | Discord

", + "about.content": "

TagStudio ist eine Anwendung zum organisieren von Fotos & Dateien mit einem zugrunde liegendem Tag-basierten System, welches sich darauf konzentriert, dem Nutzer Freiraum und Flexibilität zu bieten. Keine proprietären Programme oder Formate, kein Meer an Hilfsdateien und keine komplette Umwälzung deiner Dateisystemstruktur.

Lizenz: GPLv3
Konfigurations-Pfad: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub | Dokumentation | Discord

", "about.title": "Über", "app.git": "Git Commit", "app.pre_release": "Pre-Release", diff --git a/tagstudio/resources/translations/en.json b/tagstudio/resources/translations/en.json index 4fe852de..d1dc2caa 100644 --- a/tagstudio/resources/translations/en.json +++ b/tagstudio/resources/translations/en.json @@ -83,8 +83,8 @@ "folders_to_tags.description": "Creates tags based on your folder structure and applies them to your entries.\n The structure below shows all the tags that will be created and what entries they will be applied to.", "folders_to_tags.open_all": "Open All", "folders_to_tags.title": "Create Tags From Folders", - "about.title": "About", - "about.content": "

TagStudio Alpha {version} ({branch})

TagStudio is a photo & file organization application with an underlying tag-based system that focuses on giving freedom and flexibility to the user. No proprietary programs or formats, no sea of sidecar files, and no complete upheaval of your filesystem structure.

License: GPLv3
Config path: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub | Documentation | Discord

", + "about.title": "About TagStudio", + "about.content": "

TagStudio is a photo & file organization application with an underlying tag-based system that focuses on giving freedom and flexibility to the user. No proprietary programs or formats, no sea of sidecar files, and no complete upheaval of your filesystem structure.

License: GPLv3
Config path: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub | Documentation | Discord

", "generic.add": "Add", "generic.apply_alt": "&Apply", "generic.apply": "Apply", diff --git a/tagstudio/resources/translations/es.json b/tagstudio/resources/translations/es.json index e6732218..d56bb72b 100644 --- a/tagstudio/resources/translations/es.json +++ b/tagstudio/resources/translations/es.json @@ -1,5 +1,5 @@ { - "about.content": "

TagStudio Alpha {version} ({branch})

TagStudio es una aplicación de fotografías y archivos con un sistema de etiquetas subyacentes que se centra en dar libertad y flexibilidad al usuario. Sin programas ni formatos propios, ni un mar de archivos y sin trastornar completamente tu sistema de estructurar los archivos.

. Licencia: GPLv3
Archivo de configuración: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub | Documentación | Discord

", + "about.content": "

TagStudio es una aplicación de fotografías y archivos con un sistema de etiquetas subyacentes que se centra en dar libertad y flexibilidad al usuario. Sin programas ni formatos propios, ni un mar de archivos y sin trastornar completamente tu sistema de estructurar los archivos.

. Licencia: GPLv3
Archivo de configuración: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub | Documentación | Discord

", "about.title": "Acerca de", "app.git": "Git Commit", "app.pre_release": "Previas al lanzamiento", diff --git a/tagstudio/resources/translations/fil.json b/tagstudio/resources/translations/fil.json index e9049d50..5e06eeea 100644 --- a/tagstudio/resources/translations/fil.json +++ b/tagstudio/resources/translations/fil.json @@ -1,5 +1,5 @@ { - "about.content": "

TagStudio Alpha {version} ({branch})

Ang TagStudio ay isang application ng pagsasaayos ng file at larawan na may pinagbabatayan na tag-based na sistema na nakatutok sa pagbibigay ng kalayaan at kakayahang umangkop sa user. Walang mga proprietary na format o program, walang dagat ng mga sidecar file, at walang kaguluhan ng iyong estruktura ng filesystem.

Lisensya: GPLv3
Path ng config: {config_path}
FFMpeg: {ffmpeg}
FFProbe: {ffprobe}

GitHub | Dokumentasyon | Discord

", + "about.content": "

Ang TagStudio ay isang application ng pagsasaayos ng file at larawan na may pinagbabatayan na tag-based na sistema na nakatutok sa pagbibigay ng kalayaan at kakayahang umangkop sa user. Walang mga proprietary na format o program, walang dagat ng mga sidecar file, at walang kaguluhan ng iyong estruktura ng filesystem.

Lisensya: GPLv3
Path ng config: {config_path}
FFMpeg: {ffmpeg}
FFProbe: {ffprobe}

GitHub | Dokumentasyon | Discord

", "about.title": "Tungkol sa", "app.git": "Git Commit", "app.pre_release": "Pre-Release", diff --git a/tagstudio/resources/translations/fr.json b/tagstudio/resources/translations/fr.json index c99c10ab..b4a8a0dd 100644 --- a/tagstudio/resources/translations/fr.json +++ b/tagstudio/resources/translations/fr.json @@ -1,5 +1,5 @@ { - "about.content": "

TagStudio Alpha {version} ({branch})

TagStudio est une application d'organisation de photos et de fichiers avec un système de tags qui mets en avant la liberté et flexibilité à l'utilisateur. Pas de programmes ou de formats propriétaires, pas la moindre trace de fichiers secondaires, et pas de bouleversement complet de la structure de votre système de fichiers.

License: GPLv3
Chemin de configuration: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub | Documentation | Discord

", + "about.content": "

TagStudio est une application d'organisation de photos et de fichiers avec un système de tags qui mets en avant la liberté et flexibilité à l'utilisateur. Pas de programmes ou de formats propriétaires, pas la moindre trace de fichiers secondaires, et pas de bouleversement complet de la structure de votre système de fichiers.

License: GPLv3
Chemin de configuration: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub | Documentation | Discord

", "about.title": "À propos", "app.git": "Git Commit", "app.pre_release": "Version Préliminaire", diff --git a/tagstudio/resources/translations/hu.json b/tagstudio/resources/translations/hu.json index 9adbdcd8..68a08e93 100644 --- a/tagstudio/resources/translations/hu.json +++ b/tagstudio/resources/translations/hu.json @@ -1,5 +1,5 @@ { - "about.content": "

TagStudio Alfa {version} ({branch})

A TagStudio egy fénykép- és fájlkezelő program, mely címkék segítségével nyújt felhasználói szabadságot és rugalmasságot. A TagStudio nem használ jogvédett formátumokat, társfájlokat és nem fordítja a feje tetejére a már létező fájlrendszert.

Licenc: GPLv3
Konfigurációs fájl: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub-adattár | Dokumentáció | Discord-szerver

", + "about.content": "

A TagStudio egy fénykép- és fájlkezelő program, mely címkék segítségével nyújt felhasználói szabadságot és rugalmasságot. A TagStudio nem használ jogvédett formátumokat, társfájlokat és nem fordítja a feje tetejére a már létező fájlrendszert.

Licenc: GPLv3
Konfigurációs fájl: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub-adattár | Dokumentáció | Discord-szerver

", "about.title": "Névjegy", "app.git": "Git-véglegesítés", "app.pre_release": "Kísérleti verzió", diff --git a/tagstudio/resources/translations/pt_BR.json b/tagstudio/resources/translations/pt_BR.json index 1f57caf7..aabff130 100644 --- a/tagstudio/resources/translations/pt_BR.json +++ b/tagstudio/resources/translations/pt_BR.json @@ -1,5 +1,5 @@ { - "about.content": "

TagStudio Alpha {version} ({branch})

TagStudio é uma aplicação de organização de fotos e arquivos com um sistema de tags que tem como foco conceder liberdade e flexibilidade ao usuário. Sem programas ou formatos proprietários, sem imensidão de arquivos Sidecar, e sem total transtorno de sua estrutura de sistema de arquivos.

Licença: GPLv3
Diretório de Configuração: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub | Documentação | Discord

", + "about.content": "

TagStudio é uma aplicação de organização de fotos e arquivos com um sistema de tags que tem como foco conceder liberdade e flexibilidade ao usuário. Sem programas ou formatos proprietários, sem imensidão de arquivos Sidecar, e sem total transtorno de sua estrutura de sistema de arquivos.

Licença: GPLv3
Diretório de Configuração: {config_path}
FFmpeg: {ffmpeg}
FFprobe: {ffprobe}

GitHub | Documentação | Discord

", "about.title": "Sobre", "app.git": "Confirmação do Git", "app.pre_release": "Pré-Lançamento", diff --git a/tagstudio/src/qt/modals/about.py b/tagstudio/src/qt/modals/about.py index da077aca..87264f6c 100644 --- a/tagstudio/src/qt/modals/about.py +++ b/tagstudio/src/qt/modals/about.py @@ -8,6 +8,7 @@ from PySide6.QtCore import Qt from PySide6.QtGui import QPixmap from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget from src.core.constants import VERSION, VERSION_BRANCH +from src.core.palette import ColorType, UiColor, get_ui_color from src.qt.modals.ffmpeg_checker import FfmpegChecker from src.qt.resource_manager import ResourceManager from src.qt.translations import Translations @@ -22,9 +23,11 @@ class AboutModal(QWidget): self.rm: ResourceManager = ResourceManager() self.setWindowModality(Qt.WindowModality.ApplicationModal) - self.setMinimumSize(400, 500) + self.setMinimumSize(360, 480) self.root_layout = QVBoxLayout(self) - self.root_layout.setContentsMargins(20, 20, 20, 6) + self.root_layout.setContentsMargins(24, 24, 24, 6) + self.root_layout.setSpacing(12) + self.root_layout.setAlignment(Qt.AlignmentFlag.AlignTop) self.logo_widget = QLabel() self.logo_widget.setObjectName("logo") @@ -34,29 +37,33 @@ class AboutModal(QWidget): ) self.logo_widget.setPixmap(self.logo_pixmap) self.logo_widget.setAlignment(Qt.AlignmentFlag.AlignHCenter) - self.logo_widget.setContentsMargins(0, 0, 0, 20) + self.logo_widget.setContentsMargins(0, 0, 0, 24) ff_version = self.fc.version() - ffmpeg = 'Missing' + red = get_ui_color(ColorType.PRIMARY, UiColor.RED) + green = get_ui_color(ColorType.PRIMARY, UiColor.GREEN) + + ffmpeg = f'Missing' if ff_version["ffmpeg"] is not None: - ffmpeg = 'Found (' + ff_version["ffmpeg"] + ")" - ffprobe = 'Missing' + ffmpeg = f'Found (' + ff_version["ffmpeg"] + ")" + + ffprobe = f'Missing' if ff_version["ffprobe"] is not None: - ffprobe = 'Found (' + ff_version["ffprobe"] + ")" - self.content_widget = QLabel( + ffprobe = f'Found (' + ff_version["ffprobe"] + ")" + + branch: str = (" (" + VERSION_BRANCH + ")") if VERSION_BRANCH else "" + self.title_label = QLabel(f"

TagStudio Alpha {VERSION}{branch}

") + self.title_label.setAlignment(Qt.AlignmentFlag.AlignHCenter) + + self.content_label = QLabel( Translations.format( - "about.content", - version=VERSION, - branch=VERSION_BRANCH, - config_path=config_path, - ffmpeg=ffmpeg, - ffprobe=ffprobe, + "about.content", config_path=config_path, ffmpeg=ffmpeg, ffprobe=ffprobe ) ) - self.content_widget.setObjectName("contentLabel") - self.content_widget.setWordWrap(True) - self.content_widget.setOpenExternalLinks(True) - self.content_widget.setAlignment(Qt.AlignmentFlag.AlignHCenter) + self.content_label.setObjectName("contentLabel") + self.content_label.setWordWrap(True) + self.content_label.setOpenExternalLinks(True) + self.content_label.setAlignment(Qt.AlignmentFlag.AlignHCenter) self.button_widget = QWidget() self.button_layout = QHBoxLayout(self.button_widget) @@ -64,10 +71,11 @@ class AboutModal(QWidget): self.close_button = QPushButton(Translations["generic.close"]) self.close_button.clicked.connect(lambda: self.close()) - self.close_button.setMaximumWidth(80) self.button_layout.addWidget(self.close_button) self.root_layout.addWidget(self.logo_widget) - self.root_layout.addWidget(self.content_widget, Qt.AlignmentFlag.AlignTop) + self.root_layout.addWidget(self.title_label) + self.root_layout.addWidget(self.content_label) + self.root_layout.addStretch(1) self.root_layout.addWidget(self.button_widget)