Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ jobs:

- name: Build app bundle
run: |
QT_QPA_PLATFORM=offscreen python tools/create_icon.py --source assets/app-icon-source.png --macos-iconset assets/AppIcon.iconset
iconutil -c icns assets/AppIcon.iconset -o assets/pdfreader_by_sparsh.icns
pyinstaller --windowed --onedir --noupx --name "OpenReader" --argv-emulation --icon "assets/pdfreader_by_sparsh.icns" main.py
QT_QPA_PLATFORM=offscreen python tools/create_icon.py --source assets/branding/app-icon-source.png --macos-iconset assets/branding/AppIcon.iconset
iconutil -c icns assets/branding/AppIcon.iconset -o assets/branding/pdfreader_by_sparsh.icns
pyinstaller --windowed --onedir --noupx --name "OpenReader" --argv-emulation --icon "assets/branding/pdfreader_by_sparsh.icns" main.py

- name: Package app bundle
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Build executable
run: |
pyinstaller --noconsole --onedir --noupx --name "OpenReader" --add-data "assets;assets" --icon ".\assets\pdfreader_by_sparsh.ico" main.py
pyinstaller --noconsole --onedir --noupx --name "OpenReader" --add-data "assets;assets" --icon ".\assets\branding\pdfreader_by_sparsh.ico" main.py

- name: Determine artifact suffix
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Build Windows app
run: |
pyinstaller --noconsole --onedir --noupx --name "OpenReader" --add-data "assets;assets" --icon ".\assets\pdfreader_by_sparsh.ico" main.py
pyinstaller --noconsole --onedir --noupx --name "OpenReader" --add-data "assets;assets" --icon ".\assets\branding\pdfreader_by_sparsh.ico" main.py

- name: Package Windows ZIP
run: |
Expand Down Expand Up @@ -271,9 +271,9 @@ jobs:

- name: Build macOS app
run: |
QT_QPA_PLATFORM=offscreen python tools/create_icon.py --source assets/app-icon-source.png --macos-iconset assets/AppIcon.iconset
iconutil -c icns assets/AppIcon.iconset -o assets/pdfreader_by_sparsh.icns
pyinstaller --windowed --onedir --noupx --name "OpenReader" --argv-emulation --icon "assets/pdfreader_by_sparsh.icns" main.py
QT_QPA_PLATFORM=offscreen python tools/create_icon.py --source assets/branding/app-icon-source.png --macos-iconset assets/branding/AppIcon.iconset
iconutil -c icns assets/branding/AppIcon.iconset -o assets/branding/pdfreader_by_sparsh.icns
pyinstaller --windowed --onedir --noupx --name "OpenReader" --argv-emulation --icon "assets/branding/pdfreader_by_sparsh.icns" main.py

- name: Package macOS ZIP
run: |
Expand Down
10 changes: 5 additions & 5 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3113,16 +3113,16 @@ def _set_app_icon(self):

# 1. Frozen (PyInstaller) standard onedir layout: assets/ next to EXE
if getattr(sys, "frozen", False):
icon_paths.append(Path(sys.executable).parent / "assets" / "pdfreader_by_sparsh.ico")
icon_paths.append(Path(sys.executable).parent / "assets" / "branding" / "pdfreader_by_sparsh.ico")
# 2. _internal/assets/ layout (some PyInstaller configs)
icon_paths.append(Path(sys.executable).parent / "_internal" / "assets" / "pdfreader_by_sparsh.ico")
icon_paths.append(Path(sys.executable).parent / "_internal" / "assets" / "branding" / "pdfreader_by_sparsh.ico")

# 3. Dev/source build: icon in repo root assets/
icon_paths.append(Path(__file__).parent / "assets" / "pdfreader_by_sparsh.ico")
icon_paths.append(Path(__file__).parent / "assets" / "branding" / "pdfreader_by_sparsh.ico")

# 4. Frozen with MEIPASS (legacy PyInstaller attribute)
if getattr(sys, "frozen", False) and hasattr(sys, '_MEIPASS'):
icon_paths.append(Path(sys._MEIPASS) / "assets" / "pdfreader_by_sparsh.ico")
icon_paths.append(Path(sys._MEIPASS) / "assets" / "branding" / "pdfreader_by_sparsh.ico")

# Try each path
for p in icon_paths:
Expand Down Expand Up @@ -3989,7 +3989,7 @@ def main():
ipc_server.listen(IPC_SERVER_NAME)

# Set app-level icon before window creation for taskbar/Wayland
icon_path = Path(__file__).parent / "assets" / "pdfreader_by_sparsh.ico"
icon_path = Path(__file__).parent / "assets" / "branding" / "pdfreader_by_sparsh.ico"
if icon_path.exists():
app.setWindowIcon(QIcon(str(icon_path)))

Expand Down
2 changes: 1 addition & 1 deletion scripts/build_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (!(Test-Path -LiteralPath ".\.venv")) {
--onedir `
--noupx `
--name "OpenReader" `
--icon ".\assets\pdfreader_by_sparsh.ico" `
--icon ".\assets\branding\pdfreader_by_sparsh.ico" `
main.py

Write-Host "Built dist\OpenReader.exe (version ${version})"
6 changes: 3 additions & 3 deletions tools/create_icon.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ def write_macos_iconset(img: Image.Image, output_dir: Path):
def main():
parser = argparse.ArgumentParser(description="Create app icon assets from source PNG.")
parser.add_argument("--source", required=True, help="Path to source PNG (1024x1024 recommended)")
parser.add_argument("--ico", default="assets/pdfreader_by_sparsh.ico", help="Output .ico path")
parser.add_argument("--msix-dir", default="assets", help="Output directory for MSIX PNGs")
parser.add_argument("--macos-iconset", default="assets/AppIcon.iconset", help="Output macOS .iconset dir")
parser.add_argument("--ico", default="assets/branding/pdfreader_by_sparsh.ico", help="Output .ico path")
parser.add_argument("--msix-dir", default="assets/branding", help="Output directory for MSIX PNGs")
parser.add_argument("--macos-iconset", default="assets/branding/AppIcon.iconset", help="Output macOS .iconset dir")
args = parser.parse_args()

source_path = Path(args.source)
Expand Down
Loading